Add Alpine images (#5)

* Adding alpine build * Fixed quotes * Using flavor for the tags * Split action for quicker build * Removing branch tag * Updating documentation
Cyb3r-Jak3 · May 24, 2021 · 86da76b · 86da76b
1 parent a486e4a
commit 86da76b
Show file tree

Hide file tree

Showing 5 changed files with 97 additions and 15 deletions.
diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
@@ -5,12 +5,11 @@ on:
 
 
 jobs:
-  Docker:
+  Slim:
     runs-on: ubuntu-latest
     steps:
 
-    -
-      name: Checkout
+    - name: Checkout
       uses: actions/checkout@v2
 
     - name: Login to Docker
@@ -33,18 +32,19 @@ jobs:
         username: ${{ secrets.GITLAB_USER }}
         password: ${{ secrets.GITLAB_TOKEN }}
 
-
-    - name: Docker meta
+    - name: Docker Meta
       id: meta
       uses: docker/metadata-action@v3
       with:
         images: cyb3rjak3/pypy-flask,ghcr.io/cyb3r-jak3/pypy-flask,registry.gitlab.com/cyb3r-jak3/pypy-flask
         tags: |
-          type=ref,event=branch
           type=ref,event=pr
           type=semver,pattern={{version}}
           type=semver,pattern={{major}}.{{minor}}
           type=sha
+        labels: |
+          org.label-schema.vcs-url=https://github.com/Cyb3r-Jak3/pypy-flask.git
+          org.label-schema.schema-version=1.0.0-rc1
 
     - name: Set up QEMU
       uses: docker/[email protected]
@@ -56,10 +56,10 @@ jobs:
       uses: actions/[email protected]
       with:
         path: /tmp/.buildx-cache
-        key: buildx-${{ github.sha }}
-        restore-keys: buildx
+        key: buildx-slim-${{ github.sha }}
+        restore-keys: buildx-slim
 
-    - name: Build and Push
+    - name: Slim Build and Push
       uses: docker/[email protected]
       with:
         platforms: linux/amd64,linux/arm64
@@ -68,3 +68,71 @@ jobs:
         push: ${{ startsWith(github.ref, 'refs/tags/v') }}
         file: Dockerfile
         tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}
+
+  Alpine:
+    runs-on: ubuntu-latest
+    steps:
+
+    - name: Checkout
+      uses: actions/checkout@v2
+
+    - name: Login to Docker
+      uses: docker/login-action@v1 
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+
+    - name: Login To GitHub
+      uses: docker/login-action@v1 
+      with:
+        registry: ghcr.io
+        username: ${{ github.repository_owner }}
+        password: ${{ secrets.CR_PAT }}
+
+    - name: Login To GitLab
+      uses: docker/login-action@v1 
+      with:
+        registry: registry.gitlab.com
+        username: ${{ secrets.GITLAB_USER }}
+        password: ${{ secrets.GITLAB_TOKEN }}
+
+    - name: Docker Meta
+      id: meta
+      uses: docker/metadata-action@v3
+      with:
+        images: cyb3rjak3/pypy-flask,ghcr.io/cyb3r-jak3/pypy-flask,registry.gitlab.com/cyb3r-jak3/pypy-flask
+        flavor: |
+          suffix=-alpine
+        tags: |
+          type=ref,event=pr
+          type=semver,pattern={{version}}
+          type=semver,pattern={{major}}.{{minor}}
+          type=sha
+        labels: |
+          org.label-schema.vcs-url=https://github.com/Cyb3r-Jak3/pypy-flask.git
+          org.label-schema.schema-version=1.0.0-rc1
+
+    - name: Set up QEMU
+      uses: docker/[email protected]
+
+    - name: Set up Docker Buildx
+      uses: docker/[email protected]
+
+    - name: Cache Docker layers
+      uses: actions/[email protected]
+      with:
+        path: /tmp/.buildx-cache
+        key: buildx-alpine-${{ github.sha }}
+        restore-keys: buildx-alpine
+
+    - name: Alpine Build and Push
+      uses: docker/[email protected]
+      with:
+        platforms: linux/amd64,linux/arm64
+        cache-from: type=local,src=/tmp/.buildx-cache
+        cache-to: type=local,dest=/tmp/.buildx-cache
+        push: ${{ startsWith(github.ref, 'refs/tags/v') }}
+        file: alpine.Dockerfile
+        tags: ${{ steps.meta.outputs.tags }}
+        labels: ${{ steps.meta.outputs.labels }}
diff --git a/Dockerfile b/Dockerfile
@@ -1,9 +1,5 @@
 FROM pypy:3-slim
 
-LABEL org.label-schema.vcs-url="https://github.com/Cyb3r-Jak3/pypy-flask.git" \
-      org.label-schema.schema-version="1.0.0-rc1" \
-      org.opencontainers.image.source="https://github.com/Cyb3r-Jak3/pypy-flask"
-
 COPY requirements.txt /tmp/pip-tmp/
 RUN apt-get update \
    && apt install --no-install-recommends -y build-essential \

diff --git a/Readme.md b/Readme.md
@@ -24,3 +24,11 @@ You can replace the FROM image with any of the following:
 - ghcr.io/cyb3r-jak3/pypy-flask:latest
 - cyb3rjak3/pypy-flask:latest
 - registry.gitlab.com/cyb3r-jak3/pypy-flask:latest
+
+### Alpine
+
+There are also alpine based images avaiable. All alpine images end with `-alpine`
+
+- ghcr.io/cyb3r-jak3/pypy-flask:latest-alpine
+- cyb3rjak3/pypy-flask:latest-alpine
+- registry.gitlab.com/cyb3r-jak3/pypy-flask:latest-alpine
diff --git a/alpine.Dockerfile b/alpine.Dockerfile
@@ -0,0 +1,10 @@
+FROM jamiehewland/alpine-pypy:alpine3.11
+
+
+RUN apk add --no-cache libffi-dev gcc musl-dev make build-base
+
+COPY requirements.txt /tmp/pip-tmp/
+RUN pip --disable-pip-version-check --no-cache-dir install -r /tmp/pip-tmp/requirements.txt \
+   && rm -rf /tmp/pip-tmp
+
+RUN apk del libffi-dev gcc musl-dev make build-base
diff --git a/requirements.txt b/requirements.txt
@@ -1,3 +1,3 @@
 Flask==2.0.1
-gevent==21.1.2
-gunicorn==20.1.0
+gunicorn==20.1.0
+gevent==21.1.2