Merge pull request #39 from compose-generator/dev

Release of version 1.8.0
compose-generator · Apr 17, 2022 · 94fefc2 · 94fefc2
2 parents 441dc9e + b8348ef
commit 94fefc2
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 44 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -1,5 +1,20 @@
 version: 2
 updates:
+  # Github Actions
+  - package-ecosystem: github-actions
+    directory: /
+    schedule:
+      interval: daily
+      time: "04:00"
+      timezone: Europe/Berlin
+    open-pull-requests-limit: 15
+    target-branch: dev
+    reviewers:
+      - marcauberer
+    assignees:
+      - marcauberer
+
+  # Dockerfile - amd64
   - package-ecosystem: docker
     directory: /amd64
     schedule:
@@ -13,6 +28,7 @@ updates:
     assignees:
       - marcauberer
 
+  # Dockerfile - i386
   - package-ecosystem: docker
     directory: /i386
     schedule:
@@ -26,6 +42,7 @@ updates:
     assignees:
       - marcauberer
 
+  # Dockerfile - armv6
   - package-ecosystem: docker
     directory: /armv6
     schedule:
@@ -39,6 +56,7 @@ updates:
     assignees:
       - marcauberer
 
+  # Dockerfile - armv7
   - package-ecosystem: docker
     directory: /armv7
     schedule:
@@ -52,6 +70,7 @@ updates:
     assignees:
       - marcauberer
 
+  # Dockerfile - arm64
   - package-ecosystem: docker
     directory: /arm64
     schedule:
@@ -63,4 +82,4 @@ updates:
     reviewers:
       - marcauberer
     assignees:
-      - marcauberer
+      - marcauberer
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.0
+FROM alpine:3.15.4
 
 # Install alpine packages
-RUN apk update && apk add --no-cache sudo=1.9.8_p2-r1 bash=5.1.8-r0 curl=7.80.0-r0 git=2.34.1-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.3-r0 ruby-dev=3.0.3-r0 ruby-etc=3.0.3-r0 make=4.3-r0 \
-    zlib-dev=1.2.11-r3 icu-libs=69.1-r1 krb5-libs=1.19.2-r4 libgcc=10.3.1_git20211027-r0 libintl=0.21-r0 libssl1.1=1.1.1l-r8 libstdc++=10.3.1_git20211027-r0 \
+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 \
     && rm -rf /var/cache/apk/*
 
 # Install required npm packages
-RUN yarn config set network-timeout 600000 -g && yarn global add @angular/cli @vue/cli create-react-app express-generator && yarn cache clean --all
+RUN yarn config set network-timeout 600000 -g && yarn global add @angular/cli @vue/cli create-react-app@5.0.1 express-generator && yarn cache clean --all
 
 # Install pip dependencies
-RUN pip3 install --no-cache-dir flask-now==0.2.2 django==4.0.1
+RUN pip3 install --no-cache-dir flask-now==0.2.2 django==4.0.4
 
 # Install gem packages
-RUN gem install rails:7.0.1 && gem cleanup
+RUN gem install rails:7.0.2.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.4-r0 openssl=1.1.1l-r8 \
+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 \
     && rm -rf /var/cache/apk/* \
-    && curl -sSL -o go.tar.gz https://golang.org/dl/go1.17.6.src.tar.gz \
+    && curl -sSL -o go.tar.gz https://golang.org/dl/go1.18.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.0
+FROM alpine:3.15.4
 
 # Install alpine packages
-RUN apk update && apk add --no-cache sudo=1.9.8_p2-r1 bash=5.1.8-r0 curl=7.80.0-r0 git=2.34.1-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.3-r0 ruby-dev=3.0.3-r0 ruby-etc=3.0.3-r0 make=4.3-r0 \
-    zlib-dev=1.2.11-r3 icu-libs=69.1-r1 krb5-libs=1.19.2-r4 libgcc=10.3.1_git20211027-r0 libintl=0.21-r0 libssl1.1=1.1.1l-r8 libstdc++=10.3.1_git20211027-r0 \
+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 \
     && rm -rf /var/cache/apk/*
 
 # Install required npm packages
-RUN yarn config set network-timeout 600000 -g && yarn global add @angular/cli @vue/cli create-react-app express-generator && yarn cache clean --all
+RUN yarn config set network-timeout 600000 -g && yarn global add @angular/cli @vue/cli create-react-app@5.0.1 express-generator && yarn cache clean --all
 
 # Install pip dependencies
-RUN pip3 install --no-cache-dir flask-now==0.2.2 django==4.0.1
+RUN pip3 install --no-cache-dir flask-now==0.2.2 django==4.0.4
 
 # Install gem packages
-RUN gem install rails:7.0.1 && gem cleanup
+RUN gem install rails:7.0.2.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.4-r0 openssl=1.1.1l-r8 \
+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 \
     && rm -rf /var/cache/apk/* \
-    && curl -sSL -o go.tar.gz https://golang.org/dl/go1.17.6.src.tar.gz \
+    && curl -sSL -o go.tar.gz https://golang.org/dl/go1.18.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.0
+FROM alpine:3.15.4
 
 # Install alpine packages
-RUN apk update && apk add --no-cache sudo=1.9.8_p2-r1 bash=5.1.8-r0 curl=7.80.0-r0 git=2.34.1-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.3-r0 ruby-dev=3.0.3-r0 ruby-etc=3.0.3-r0 make=4.3-r0 \
-    zlib-dev=1.2.11-r3 icu-libs=69.1-r1 krb5-libs=1.19.2-r4 libgcc=10.3.1_git20211027-r0 libintl=0.21-r0 libssl1.1=1.1.1l-r8 libstdc++=10.3.1_git20211027-r0 \
+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 \
     && rm -rf /var/cache/apk/*
 
 # Install required npm packages
-RUN yarn config set network-timeout 600000 -g && yarn global add @angular/cli @vue/cli create-react-app express-generator && yarn cache clean --all
+RUN yarn config set network-timeout 600000 -g && yarn global add @angular/cli @vue/cli create-react-app@5.0.1 express-generator && yarn cache clean --all
 
 # Install pip dependencies
-RUN pip3 install --no-cache-dir flask-now==0.2.2 django==4.0.1
+RUN pip3 install --no-cache-dir flask-now==0.2.2 django==4.0.4
 
 # Install gem packages
-RUN gem install rails:7.0.1 && gem cleanup
+RUN gem install rails:7.0.2.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.4-r0 openssl=1.1.1l-r8 \
+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 \
     && rm -rf /var/cache/apk/* \
-    && curl -sSL -o go.tar.gz https://golang.org/dl/go1.17.6.src.tar.gz \
+    && curl -sSL -o go.tar.gz https://golang.org/dl/go1.18.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.0
+FROM alpine:3.15.4
 
 # Install alpine packages
-RUN apk update && apk add --no-cache sudo=1.9.8_p2-r1 bash=5.1.8-r0 curl=7.80.0-r0 git=2.34.1-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.3-r0 ruby-dev=3.0.3-r0 ruby-etc=3.0.3-r0 make=4.3-r0 \
-    zlib-dev=1.2.11-r3 icu-libs=69.1-r1 krb5-libs=1.19.2-r4 libgcc=10.3.1_git20211027-r0 libintl=0.21-r0 libssl1.1=1.1.1l-r8 libstdc++=10.3.1_git20211027-r0 \
+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 \
     && rm -rf /var/cache/apk/*
 
 # Install required npm packages
-RUN yarn config set network-timeout 600000 -g && yarn global add @angular/cli @vue/cli create-react-app express-generator && yarn cache clean --all
+RUN yarn config set network-timeout 600000 -g && yarn global add @angular/cli @vue/cli create-react-app@5.0.1 express-generator && yarn cache clean --all
 
 # Install pip dependencies
-RUN pip3 install --no-cache-dir flask-now==0.2.2 django==4.0.1
+RUN pip3 install --no-cache-dir flask-now==0.2.2 django==4.0.4
 
 # Install gem packages
-RUN gem install rails:7.0.1 && gem cleanup
+RUN gem install rails:7.0.2.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.4-r0 openssl=1.1.1l-r8 \
+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 \
     && rm -rf /var/cache/apk/* \
-    && curl -sSL -o go.tar.gz https://golang.org/dl/go1.17.6.src.tar.gz \
+    && curl -sSL -o go.tar.gz https://golang.org/dl/go1.18.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.0
+FROM alpine:3.15.4
 
 # Install alpine packages
-RUN apk update && apk add --no-cache sudo=1.9.8_p2-r1 bash=5.1.8-r0 curl=7.80.0-r0 git=2.34.1-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.3-r0 ruby-dev=3.0.3-r0 ruby-etc=3.0.3-r0 make=4.3-r0 \
-    zlib-dev=1.2.11-r3 icu-libs=69.1-r1 krb5-libs=1.19.2-r4 libgcc=10.3.1_git20211027-r0 libintl=0.21-r0 libssl1.1=1.1.1l-r8 libstdc++=10.3.1_git20211027-r0 \
+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 \
     && rm -rf /var/cache/apk/*
 
 # Install required npm packages
-RUN yarn config set network-timeout 600000 -g && yarn global add @angular/cli @vue/cli create-react-app express-generator && yarn cache clean --all
+RUN yarn config set network-timeout 600000 -g && yarn global add @angular/cli @vue/cli create-react-app@5.0.1 express-generator && yarn cache clean --all
 
 # Install pip dependencies
-RUN pip3 install --no-cache-dir flask-now==0.2.2 django==4.0.1
+RUN pip3 install --no-cache-dir flask-now==0.2.2 django==4.0.4
 
 # Install gem packages
-RUN gem install rails:7.0.1 && gem cleanup
+RUN gem install rails:7.0.2.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