Merge pull request #49 from compose-generator/dev

Release of version 1.9.0
compose-generator · Jul 2, 2022 · f608811 · f608811
2 parents 94fefc2 + 27773ac
commit f608811
Show file tree

Hide file tree

Showing 9 changed files with 56 additions and 56 deletions.
diff --git a/.github/workflows/misspell.yml b/.github/workflows/misspell.yml
@@ -14,7 +14,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Misspell
         uses: reviewdog/action-misspell@v1

diff --git a/.github/workflows/publish-dev.yml b/.github/workflows/publish-dev.yml
@@ -41,23 +41,23 @@ jobs:
             }
     steps:
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Docker login GHCR
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.CR_PAT }}
 
       - name: Docker login Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: docker.io
           username: chillibits
@@ -75,17 +75,17 @@ jobs:
     needs: build
     steps:
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Docker login GHCR
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.CR_PAT }}
 
       - name: Docker login Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: docker.io
           username: chillibits

diff --git a/.github/workflows/publish.yml b/.github/workflows/publish.yml
@@ -38,23 +38,23 @@ jobs:
         uses: battila7/get-version-action@v2
 
       - name: Checkout
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Set up QEMU
-        uses: docker/setup-qemu-action@v1
+        uses: docker/setup-qemu-action@v2
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Docker login GHCR
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.CR_PAT }}
 
       - name: Docker login Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: docker.io
           username: chillibits
@@ -76,17 +76,17 @@ jobs:
         uses: battila7/get-version-action@v2
 
       - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v1
+        uses: docker/setup-buildx-action@v2
 
       - name: Docker login GHCR
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: ghcr.io
           username: ${{ github.repository_owner }}
           password: ${{ secrets.CR_PAT }}
 
       - name: Docker login Docker Hub
-        uses: docker/login-action@v1
+        uses: docker/login-action@v2
         with:
           registry: docker.io
           username: chillibits

diff --git a/.github/workflows/validate.yml b/.github/workflows/validate.yml
@@ -15,7 +15,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout code
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
 
       - name: Lint Dockerfile (amd64)
         run: docker run --rm -i hadolint/hadolint < ./amd64/Dockerfile

diff --git a/amd64/Dockerfile b/amd64/Dockerfile
@@ -1,27 +1,27 @@
 # Copyright © 2021-2022 Compose Generator Contributors
 # All rights reserved.
 
-FROM alpine:3.15.4
+FROM alpine:3.16.0
 
 # Install alpine packages
-RUN apk update && apk add --no-cache sudo=1.9.8_p2-r1 bash=5.1.16-r0 curl=7.80.0-r0 git=2.34.2-r0 npm=8.1.3-r0 yarn=1.22.17-r0 \
-    unzip=6.0-r9 python3=3.9.7-r4 py3-pip=20.3.4-r1 rust=1.56.1-r0 ruby=3.0.4-r0 ruby-dev=3.0.4-r0 ruby-etc=3.0.4-r0 make=4.3-r0 \
-    zlib-dev=1.2.12-r0 icu-libs=69.1-r1 krb5-libs=1.19.3-r0 libgcc=10.3.1_git20211027-r0 libintl=0.21-r0 libssl1.1=1.1.1n-r0 libstdc++=10.3.1_git20211027-r0 \
+RUN apk update && apk add --no-cache sudo=1.9.10-r0 bash=5.1.16-r2 curl=7.83.1-r2 git=2.36.1-r0 npm=8.10.0-r0 yarn=1.22.19-r0 \
+    unzip=6.0-r9 python3=3.10.4-r0 py3-pip=22.1.1-r0 rust=1.60.0-r2 ruby=3.1.2-r0 ruby-dev=3.1.2-r0 ruby-etc=3.1.2-r0 make=4.3-r0 \
+    zlib-dev=1.2.12-r1 icu-libs=71.1-r2 krb5-libs=1.19.3-r0 libgcc=11.2.1_git20220219-r2 libintl=0.21-r2 libssl1.1=1.1.1o-r0 libstdc++=11.2.1_git20220219-r2 \
     && rm -rf /var/cache/apk/*
 
 # Install required npm packages
 RUN yarn config set network-timeout 600000 -g && yarn global add @angular/cli @vue/cli [email protected] express-generator && yarn cache clean --all
 
 # Install pip dependencies
-RUN pip3 install --no-cache-dir flask-now==0.2.2 django==4.0.4
+RUN pip3 install --no-cache-dir flask-now==0.2.2 django==4.0.5
 
 # Install gem packages
-RUN gem install rails:7.0.2.3 && gem cleanup
+RUN gem install rails:7.0.3 && gem cleanup
 
 # Install golang
-RUN apk add --no-cache --virtual .build-deps gcc=10.3.1_git20211027-r0 musl-dev=1.2.2-r7 go=1.17.9-r0 openssl=1.1.1n-r0 \
+RUN apk add --no-cache --virtual .build-deps gcc=11.2.1_git20220219-r2 musl-dev=1.2.3-r0 go=1.18.2-r0 openssl=1.1.1p-r0 \
     && rm -rf /var/cache/apk/* \
-    && curl -sSL -o go.tar.gz https://golang.org/dl/go1.18.src.tar.gz \
+    && curl -sSL -o go.tar.gz https://golang.org/dl/go1.18.3.src.tar.gz \
     && tar -C /usr/local -xzf go.tar.gz && rm go.tar.gz
 WORKDIR /usr/local/go/src/
 RUN ./make.bash && apk del .build-deps

diff --git a/arm64/Dockerfile b/arm64/Dockerfile
@@ -1,27 +1,27 @@
 # Copyright © 2021-2022 Compose Generator Contributors
 # All rights reserved.
 
-FROM alpine:3.15.4
+FROM alpine:3.16.0
 
 # Install alpine packages
-RUN apk update && apk add --no-cache sudo=1.9.8_p2-r1 bash=5.1.16-r0 curl=7.80.0-r0 git=2.34.2-r0 npm=8.1.3-r0 yarn=1.22.17-r0 \
-    unzip=6.0-r9 python3=3.9.7-r4 py3-pip=20.3.4-r1 rust=1.56.1-r0 ruby=3.0.4-r0 ruby-dev=3.0.4-r0 ruby-etc=3.0.4-r0 make=4.3-r0 \
-    zlib-dev=1.2.12-r0 icu-libs=69.1-r1 krb5-libs=1.19.3-r0 libgcc=10.3.1_git20211027-r0 libintl=0.21-r0 libssl1.1=1.1.1n-r0 libstdc++=10.3.1_git20211027-r0 \
+RUN apk update && apk add --no-cache sudo=1.9.10-r0 bash=5.1.16-r2 curl=7.83.1-r2 git=2.36.1-r0 npm=8.10.0-r0 yarn=1.22.19-r0 \
+    unzip=6.0-r9 python3=3.10.4-r0 py3-pip=22.1.1-r0 rust=1.60.0-r2 ruby=3.1.2-r0 ruby-dev=3.1.2-r0 ruby-etc=3.1.2-r0 make=4.3-r0 \
+    zlib-dev=1.2.12-r1 icu-libs=71.1-r2 krb5-libs=1.19.3-r0 libgcc=11.2.1_git20220219-r2 libintl=0.21-r2 libssl1.1=1.1.1o-r0 libstdc++=11.2.1_git20220219-r2 \
     && rm -rf /var/cache/apk/*
 
 # Install required npm packages
 RUN yarn config set network-timeout 600000 -g && yarn global add @angular/cli @vue/cli [email protected] express-generator && yarn cache clean --all
 
 # Install pip dependencies
-RUN pip3 install --no-cache-dir flask-now==0.2.2 django==4.0.4
+RUN pip3 install --no-cache-dir flask-now==0.2.2 django==4.0.5
 
 # Install gem packages
-RUN gem install rails:7.0.2.3 && gem cleanup
+RUN gem install rails:7.0.3 && gem cleanup
 
 # Install golang
-RUN apk add --no-cache --virtual .build-deps gcc=10.3.1_git20211027-r0 musl-dev=1.2.2-r7 go=1.17.9-r0 openssl=1.1.1n-r0 \
+RUN apk add --no-cache --virtual .build-deps gcc=11.2.1_git20220219-r2 musl-dev=1.2.3-r0 go=1.18.2-r0 openssl=1.1.1p-r0 \
     && rm -rf /var/cache/apk/* \
-    && curl -sSL -o go.tar.gz https://golang.org/dl/go1.18.src.tar.gz \
+    && curl -sSL -o go.tar.gz https://golang.org/dl/go1.18.3.src.tar.gz \
     && tar -C /usr/local -xzf go.tar.gz && rm go.tar.gz
 WORKDIR /usr/local/go/src/
 RUN ./make.bash && apk del .build-deps

diff --git a/armv6/Dockerfile b/armv6/Dockerfile
@@ -1,27 +1,27 @@
 # Copyright © 2021-2022 Compose Generator Contributors
 # All rights reserved.
 
-FROM alpine:3.15.4
+FROM alpine:3.16.0
 
 # Install alpine packages
-RUN apk update && apk add --no-cache sudo=1.9.8_p2-r1 bash=5.1.16-r0 curl=7.80.0-r0 git=2.34.2-r0 npm=8.1.3-r0 yarn=1.22.17-r0 \
-    unzip=6.0-r9 python3=3.9.7-r4 py3-pip=20.3.4-r1 rust=1.56.1-r0 ruby=3.0.4-r0 ruby-dev=3.0.4-r0 ruby-etc=3.0.4-r0 make=4.3-r0 \
-    zlib-dev=1.2.12-r0 icu-libs=69.1-r1 krb5-libs=1.19.3-r0 libgcc=10.3.1_git20211027-r0 libintl=0.21-r0 libssl1.1=1.1.1n-r0 libstdc++=10.3.1_git20211027-r0 \
+RUN apk update && apk add --no-cache sudo=1.9.10-r0 bash=5.1.16-r2 curl=7.83.1-r2 git=2.36.1-r0 npm=8.10.0-r0 yarn=1.22.19-r0 \
+    unzip=6.0-r9 python3=3.10.4-r0 py3-pip=22.1.1-r0 rust=1.60.0-r2 ruby=3.1.2-r0 ruby-dev=3.1.2-r0 ruby-etc=3.1.2-r0 make=4.3-r0 \
+    zlib-dev=1.2.12-r1 icu-libs=71.1-r2 krb5-libs=1.19.3-r0 libgcc=11.2.1_git20220219-r2 libintl=0.21-r2 libssl1.1=1.1.1o-r0 libstdc++=11.2.1_git20220219-r2 \
     && rm -rf /var/cache/apk/*
 
 # Install required npm packages
 RUN yarn config set network-timeout 600000 -g && yarn global add @angular/cli @vue/cli [email protected] express-generator && yarn cache clean --all
 
 # Install pip dependencies
-RUN pip3 install --no-cache-dir flask-now==0.2.2 django==4.0.4
+RUN pip3 install --no-cache-dir flask-now==0.2.2 django==4.0.5
 
 # Install gem packages
-RUN gem install rails:7.0.2.3 && gem cleanup
+RUN gem install rails:7.0.3 && gem cleanup
 
 # Install golang
-RUN apk add --no-cache --virtual .build-deps gcc=10.3.1_git20211027-r0 musl-dev=1.2.2-r7 go=1.17.9-r0 openssl=1.1.1n-r0 \
+RUN apk add --no-cache --virtual .build-deps gcc=11.2.1_git20220219-r2 musl-dev=1.2.3-r0 go=1.18.2-r0 openssl=1.1.1p-r0 \
     && rm -rf /var/cache/apk/* \
-    && curl -sSL -o go.tar.gz https://golang.org/dl/go1.18.src.tar.gz \
+    && curl -sSL -o go.tar.gz https://golang.org/dl/go1.18.3.src.tar.gz \
     && tar -C /usr/local -xzf go.tar.gz && rm go.tar.gz
 WORKDIR /usr/local/go/src/
 RUN ./make.bash && apk del .build-deps

diff --git a/armv7/Dockerfile b/armv7/Dockerfile
@@ -1,27 +1,27 @@
 # Copyright © 2021-2022 Compose Generator Contributors
 # All rights reserved.
 
-FROM alpine:3.15.4
+FROM alpine:3.16.0
 
 # Install alpine packages
-RUN apk update && apk add --no-cache sudo=1.9.8_p2-r1 bash=5.1.16-r0 curl=7.80.0-r0 git=2.34.2-r0 npm=8.1.3-r0 yarn=1.22.17-r0 \
-    unzip=6.0-r9 python3=3.9.7-r4 py3-pip=20.3.4-r1 rust=1.56.1-r0 ruby=3.0.4-r0 ruby-dev=3.0.4-r0 ruby-etc=3.0.4-r0 make=4.3-r0 \
-    zlib-dev=1.2.12-r0 icu-libs=69.1-r1 krb5-libs=1.19.3-r0 libgcc=10.3.1_git20211027-r0 libintl=0.21-r0 libssl1.1=1.1.1n-r0 libstdc++=10.3.1_git20211027-r0 \
+RUN apk update && apk add --no-cache sudo=1.9.10-r0 bash=5.1.16-r2 curl=7.83.1-r2 git=2.36.1-r0 npm=8.10.0-r0 yarn=1.22.19-r0 \
+    unzip=6.0-r9 python3=3.10.4-r0 py3-pip=22.1.1-r0 rust=1.60.0-r2 ruby=3.1.2-r0 ruby-dev=3.1.2-r0 ruby-etc=3.1.2-r0 make=4.3-r0 \
+    zlib-dev=1.2.12-r1 icu-libs=71.1-r2 krb5-libs=1.19.3-r0 libgcc=11.2.1_git20220219-r2 libintl=0.21-r2 libssl1.1=1.1.1o-r0 libstdc++=11.2.1_git20220219-r2 \
     && rm -rf /var/cache/apk/*
 
 # Install required npm packages
 RUN yarn config set network-timeout 600000 -g && yarn global add @angular/cli @vue/cli [email protected] express-generator && yarn cache clean --all
 
 # Install pip dependencies
-RUN pip3 install --no-cache-dir flask-now==0.2.2 django==4.0.4
+RUN pip3 install --no-cache-dir flask-now==0.2.2 django==4.0.5
 
 # Install gem packages
-RUN gem install rails:7.0.2.3 && gem cleanup
+RUN gem install rails:7.0.3 && gem cleanup
 
 # Install golang
-RUN apk add --no-cache --virtual .build-deps gcc=10.3.1_git20211027-r0 musl-dev=1.2.2-r7 go=1.17.9-r0 openssl=1.1.1n-r0 \
+RUN apk add --no-cache --virtual .build-deps gcc=11.2.1_git20220219-r2 musl-dev=1.2.3-r0 go=1.18.2-r0 openssl=1.1.1p-r0 \
     && rm -rf /var/cache/apk/* \
-    && curl -sSL -o go.tar.gz https://golang.org/dl/go1.18.src.tar.gz \
+    && curl -sSL -o go.tar.gz https://golang.org/dl/go1.18.3.src.tar.gz \
     && tar -C /usr/local -xzf go.tar.gz && rm go.tar.gz
 WORKDIR /usr/local/go/src/
 RUN ./make.bash && apk del .build-deps

diff --git a/i386/Dockerfile b/i386/Dockerfile
@@ -1,22 +1,22 @@
 # Copyright © 2021-2022 Compose Generator Contributors
 # All rights reserved.
 
-FROM alpine:3.15.4
+FROM alpine:3.16.0
 
 # Install alpine packages
-RUN apk update && apk add --no-cache sudo=1.9.8_p2-r1 bash=5.1.16-r0 curl=7.80.0-r0 git=2.34.2-r0 npm=8.1.3-r0 yarn=1.22.17-r0 \
-    unzip=6.0-r9 python3=3.9.7-r4 py3-pip=20.3.4-r1 rust=1.56.1-r0 ruby=3.0.4-r0 ruby-dev=3.0.4-r0 ruby-etc=3.0.4-r0 make=4.3-r0 \
-    zlib-dev=1.2.12-r0 icu-libs=69.1-r1 krb5-libs=1.19.3-r0 libgcc=10.3.1_git20211027-r0 libintl=0.21-r0 libssl1.1=1.1.1n-r0 libstdc++=10.3.1_git20211027-r0 \
+RUN apk update && apk add --no-cache sudo=1.9.10-r0 bash=5.1.16-r2 curl=7.83.1-r2 git=2.36.1-r0 npm=8.10.0-r0 yarn=1.22.19-r0 \
+    unzip=6.0-r9 python3=3.10.4-r0 py3-pip=22.1.1-r0 rust=1.60.0-r2 ruby=3.1.2-r0 ruby-dev=3.1.2-r0 ruby-etc=3.1.2-r0 make=4.3-r0 \
+    zlib-dev=1.2.12-r1 icu-libs=71.1-r2 krb5-libs=1.19.3-r0 libgcc=11.2.1_git20220219-r2 libintl=0.21-r2 libssl1.1=1.1.1o-r0 libstdc++=11.2.1_git20220219-r2 \
     && rm -rf /var/cache/apk/*
 
 # Install required npm packages
 RUN yarn config set network-timeout 600000 -g && yarn global add @angular/cli @vue/cli [email protected] express-generator && yarn cache clean --all
 
 # Install pip dependencies
-RUN pip3 install --no-cache-dir flask-now==0.2.2 django==4.0.4
+RUN pip3 install --no-cache-dir flask-now==0.2.2 django==4.0.5
 
 # Install gem packages
-RUN gem install rails:7.0.2.3 && gem cleanup
+RUN gem install rails:7.0.3 && gem cleanup
 
 # Install dotnet
 RUN curl -sSL -o dotnet-install.sh https://dot.net/v1/dotnet-install.sh && chmod +x dotnet-install.sh && bash dotnet-install.sh && rm dotnet-install.sh