Browse Source

Merge pull request #5 from KhashayarDanesh/master

Added Alpine 3.11
Mohammad Abdolirad 5 năm trước cách đây
mục cha
commit
113a1e65ae
4 tập tin đã thay đổi với 85 bổ sung2 xóa
  1. 29 1
      .drone.yml
  2. 13 0
      3.11/Dockerfile
  3. 38 0
      3.11/openrc/Dockerfile
  4. 5 1
      README.md

+ 29 - 1
.drone.yml

@@ -159,7 +159,6 @@ steps:
       dockerfile: 3.10/Dockerfile
       tags:
         - '3.10'
-        - 'latest'
 
   - name: alpine3.10-openrc
     image: plugins/docker
@@ -173,6 +172,35 @@ steps:
       tags:
         - '3.10-openrc'
 
+kind: pipeline
+name: alpine3.11
+
+steps:
+  - name: alpine3.11
+    image: plugins/docker
+    settings:
+      username:
+        from_secret: DOCKER_USERNAME
+      password:
+        from_secret: DOCKER_PASSWORD
+      repo: dockage/alpine
+      dockerfile: 3.11/Dockerfile
+      tags:
+        - '3.11'
+        - 'latest'
+
+  - name: alpine3.11-openrc
+    image: plugins/docker
+    settings:
+      username:
+        from_secret: DOCKER_USERNAME
+      password:
+        from_secret: DOCKER_PASSWORD
+      repo: dockage/alpine
+      dockerfile: 3.11/openrc/Dockerfile
+      tags:
+        - '3.11-openrc'
+
 ---
 kind: pipeline
 name: notify

+ 13 - 0
3.11/Dockerfile

@@ -0,0 +1,13 @@
+FROM alpine:3.11
+
+LABEL maintainer="danesh@riseup.net" \
+    org.label-schema.name="alpine" \
+    org.label-schema.vendor="Dockage" \
+    org.label-schema.description="Alpine image that forms the base for Dockage's docker images." \
+    org.label-schema.version="3.11" \
+    org.label-schema.license="MIT"
+
+RUN echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/main' >> /etc/apk/repositories \
+    && echo '@edgecommunity http://dl-cdn.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories \
+    && echo '@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories \
+    && apk add --no-cache su-exec ca-certificates wait4ports

+ 38 - 0
3.11/openrc/Dockerfile

@@ -0,0 +1,38 @@
+FROM alpine:3.11
+
+LABEL maintainer="danesh@riseup.net" \
+    org.label-schema.name="alpine" \
+    org.label-schema.vendor="Dockage" \
+    org.label-schema.description="Docker image uses openRC as a process supervision on Alpine Linux" \
+    org.label-schema.version="3.11-openrc" \
+    org.label-schema.license="MIT"
+
+RUN echo '@edge http://dl-cdn.alpinelinux.org/alpine/edge/main' >> /etc/apk/repositories \
+    && echo '@edgecommunity http://dl-cdn.alpinelinux.org/alpine/edge/community' >> /etc/apk/repositories \
+    && echo '@testing http://dl-cdn.alpinelinux.org/alpine/edge/testing' >> /etc/apk/repositories \
+    && apk add --no-cache openrc su-exec ca-certificates wait4ports \
+    # Disable getty's
+    && sed -i 's/^\(tty\d\:\:\)/#\1/g' /etc/inittab \
+    && sed -i \
+        # Change subsystem type to "docker"
+        -e 's/#rc_sys=".*"/rc_sys="docker"/g' \
+        # Allow all variables through
+        -e 's/#rc_env_allow=".*"/rc_env_allow="\*"/g' \
+        # Start crashed services
+        -e 's/#rc_crashed_stop=.*/rc_crashed_stop=NO/g' \
+        -e 's/#rc_crashed_start=.*/rc_crashed_start=YES/g' \
+        # Define extra dependencies for services
+        -e 's/#rc_provide=".*"/rc_provide="loopback net"/g' \
+        /etc/rc.conf \
+    # Remove unnecessary services
+    && rm -f /etc/init.d/hwdrivers \
+            /etc/init.d/hwclock \
+            /etc/init.d/hwdrivers \
+            /etc/init.d/modules \
+            /etc/init.d/modules-load \
+            /etc/init.d/modloop \
+    # Can't do cgroups
+    && sed -i 's/\tcgroup_add_service/\t#cgroup_add_service/g' /lib/rc/sh/openrc-run.sh \
+    && sed -i 's/VSERVER/DOCKER/Ig' /lib/rc/sh/init.sh
+
+CMD ["/sbin/init"]

+ 5 - 1
README.md

@@ -12,8 +12,12 @@
 |`3.7-openrc` ([3.7/openrc/Dockerfile](https://github.com/dockage/alpine/blob/master/3.7/openrc/Dockerfile))|[![MicroBadger Size (3.7-openrc)](https://img.shields.io/microbadger/image-size/dockage/alpine/3.7-openrc.svg)](https://microbadger.com/images/dockage/alpine:3.7-openrc)|[![MicroBadger Layers (3.7-openrc)](https://img.shields.io/microbadger/layers/dockage/alpine/3.7-openrc.svg)](https://microbadger.com/images/dockage/alpine:3.7-openrc)|
 |`3.8` ([3.8/Dockerfile](https://github.com/dockage/alpine/blob/master/3.8/Dockerfile))|[![MicroBadger Size (3.8)](https://img.shields.io/microbadger/image-size/dockage/alpine/3.8.svg)](https://microbadger.com/images/dockage/alpine:3.8)|[![MicroBadger Layers (3.8)](https://img.shields.io/microbadger/layers/dockage/alpine/3.8.svg)](https://microbadger.com/images/dockage/alpine:3.8)|
 |`3.8-openrc` ([3.8/openrc/Dockerfile](https://github.com/dockage/alpine/blob/master/3.8/openrc/Dockerfile))|[![MicroBadger Size (3.8-openrc)](https://img.shields.io/microbadger/image-size/dockage/alpine/3.8-openrc.svg)](https://microbadger.com/images/dockage/alpine:3.8-openrc)|[![MicroBadger Layers (3.8-openrc)](https://img.shields.io/microbadger/layers/dockage/alpine/3.8-openrc.svg)](https://microbadger.com/images/dockage/alpine:3.8-openrc)|
-|`3.9`, `latest` ([3.9/Dockerfile](https://github.com/dockage/alpine/blob/master/3.9/Dockerfile))|[![MicroBadger Size (3.9)](https://img.shields.io/microbadger/image-size/dockage/alpine/3.9.svg)](https://microbadger.com/images/dockage/alpine:3.9)|[![MicroBadger Layers (3.9)](https://img.shields.io/microbadger/layers/dockage/alpine/3.9.svg)](https://microbadger.com/images/dockage/alpine:3.9)|
+|`3.9` ([3.9/Dockerfile](https://github.com/dockage/alpine/blob/master/3.9/Dockerfile))|[![MicroBadger Size (3.9)](https://img.shields.io/microbadger/image-size/dockage/alpine/3.9.svg)](https://microbadger.com/images/dockage/alpine:3.9)|[![MicroBadger Layers (3.9)](https://img.shields.io/microbadger/layers/dockage/alpine/3.9.svg)](https://microbadger.com/images/dockage/alpine:3.9)|
 |`3.9-openrc` ([3.9/openrc/Dockerfile](https://github.com/dockage/alpine/blob/master/3.9/openrc/Dockerfile))|[![MicroBadger Size (3.9-openrc)](https://img.shields.io/microbadger/image-size/dockage/alpine/3.9-openrc.svg)](https://microbadger.com/images/dockage/alpine:3.9-openrc)|[![MicroBadger Layers (3.9-openrc)](https://img.shields.io/microbadger/layers/dockage/alpine/3.9-openrc.svg)](https://microbadger.com/images/dockage/alpine:3.9-openrc)|
+|`3.10` ([3.10/Dockerfile](https://github.com/dockage/alpine/blob/master/3.10/Dockerfile))|[![MicroBadger Size (3.10)](https://img.shields.io/microbadger/image-size/dockage/alpine/3.10.svg)](https://microbadger.com/images/dockage/alpine:3.10)|[![MicroBadger Layers (3.10)](https://img.shields.io/microbadger/layers/dockage/alpine/3.10.svg)](https://microbadger.com/images/dockage/alpine:3.10)|
+|`3.10-openrc` ([3.10/openrc/Dockerfile](https://github.com/dockage/alpine/blob/master/3.10/openrc/Dockerfile))|[![MicroBadger Size (3.10-openrc)](https://img.shields.io/microbadger/image-size/dockage/alpine/3.10-openrc.svg)](https://microbadger.com/images/dockage/alpine:3.10-openrc)|[![MicroBadger Layers (3.10-openrc)](https://img.shields.io/microbadger/layers/dockage/alpine/3.10-openrc.svg)](https://microbadger.com/images/dockage/alpine:3.10-openrc)|
+|`3.11`, `latest` ([3.11/Dockerfile](https://github.com/dockage/alpine/blob/master/3.11/Dockerfile))|[![MicroBadger Size (3.11)](https://img.shields.io/microbadger/image-size/dockage/alpine/3.11.svg)](https://microbadger.com/images/dockage/alpine:3.11)|[![MicroBadger Layers (3.9)](https://img.shields.io/microbadger/layers/dockage/alpine/3.11.svg)](https://microbadger.com/images/dockage/alpine:3.11)|
+|`3.11-openrc` ([3.11/openrc/Dockerfile](https://github.com/dockage/alpine/blob/master/3.11/openrc/Dockerfile))|[![MicroBadger Size (3.11-openrc)](https://img.shields.io/microbadger/image-size/dockage/alpine/3.11-openrc.svg)](https://microbadger.com/images/dockage/alpine:3.11-openrc)|[![MicroBadger Layers (3.11-openrc)](https://img.shields.io/microbadger/layers/dockage/alpine/3.11-openrc.svg)](https://microbadger.com/images/dockage/alpine:3.11-openrc)|
 
 Dockerfile to build a alpine baseimage with a couple of extra packages and enable some repositories.