Merge pull request #295 from uselagoon/alpine_314

update to alpine 3.14
uselagoon · Sep 6, 2021 · edaeb00 · edaeb00
2 parents 46eff04 + 49f9d7b
commit edaeb00
Show file tree

Hide file tree

Showing 16 changed files with 18 additions and 17 deletions.
diff --git a/images/commons/Dockerfile b/images/commons/Dockerfile
@@ -1,9 +1,9 @@
-FROM golang:alpine3.13 AS builder
+FROM golang:alpine3.14 AS builder
 RUN GIT_TAG=github.com/smlx/go-crond@custom-workdir-mod-update GIT_COMMIT=1b81c05ef34903427ed06a56c26cc268a0377b83; \
     GO111MODULE=on CGO_ENABLED=0 go get -ldflags "-X main.gitTag=$GIT_TAG -X main.gitCommit=$GIT_COMMIT" \
     github.com/smlx/go-crond@$GIT_COMMIT
 
-FROM alpine:3.13.6
+FROM alpine:3.14.2
 
 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
 LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"

diff --git a/images/mariadb/10.5.Dockerfile b/images/mariadb/10.5.Dockerfile
@@ -1,6 +1,6 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons as commons
-FROM alpine:3.13.6
+FROM alpine:3.14.2
 
 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
 LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"

diff --git a/images/node/12.Dockerfile b/images/node/12.Dockerfile
@@ -1,6 +1,6 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons as commons
-FROM node:12.22-alpine3.12
+FROM node:12.22-alpine3.14
 
 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
 LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"

diff --git a/images/node/14.Dockerfile b/images/node/14.Dockerfile
@@ -1,6 +1,6 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons as commons
-FROM node:14.17-alpine3.13
+FROM node:14.17-alpine3.14
 
 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
 LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"

diff --git a/images/node/16.Dockerfile b/images/node/16.Dockerfile
@@ -1,6 +1,6 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons as commons
-FROM node:16.8-alpine3.13
+FROM node:16.8-alpine3.14
 
 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
 LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"

diff --git a/images/php-cli/7.3.Dockerfile b/images/php-cli/7.3.Dockerfile
@@ -27,7 +27,7 @@ RUN apk add --no-cache git \
         openssh-sftp-server \
         findutils \
         nodejs-current \
-        nodejs-npm \
+        npm \
         yarn \
     && ln -s /usr/lib/ssh/sftp-server /usr/local/bin/sftp-server \
     && rm -rf /var/cache/apk/* \

diff --git a/images/php-cli/7.4.Dockerfile b/images/php-cli/7.4.Dockerfile
@@ -27,7 +27,7 @@ RUN apk add --no-cache git \
         openssh-sftp-server \
         findutils \
         nodejs-current \
-        nodejs-npm \
+        npm \
         yarn \
     && ln -s /usr/lib/ssh/sftp-server /usr/local/bin/sftp-server \
     && rm -rf /var/cache/apk/* \

diff --git a/images/php-cli/8.0.Dockerfile b/images/php-cli/8.0.Dockerfile
@@ -24,7 +24,7 @@ RUN apk add --no-cache git \
         openssh-sftp-server \
         findutils \
         nodejs-current \
-        nodejs-npm \
+        npm \
         yarn \
     && ln -s /usr/lib/ssh/sftp-server /usr/local/bin/sftp-server \
     && rm -rf /var/cache/apk/* \

diff --git a/images/php-fpm/7.3.Dockerfile b/images/php-fpm/7.3.Dockerfile
@@ -5,7 +5,7 @@ FROM composer:latest as healthcheckbuilder
 
 RUN composer create-project --no-dev amazeeio/healthz-php /healthz-php v0.0.6
 
-FROM php:7.3.30-fpm-alpine3.13
+FROM php:7.3.30-fpm-alpine3.14
 
 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
 LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"

diff --git a/images/php-fpm/7.4.Dockerfile b/images/php-fpm/7.4.Dockerfile
@@ -5,7 +5,7 @@ FROM composer:latest as healthcheckbuilder
 
 RUN composer create-project --no-dev amazeeio/healthz-php /healthz-php v0.0.6
 
-FROM php:7.4.23-fpm-alpine3.13
+FROM php:7.4.23-fpm-alpine3.14
 
 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
 LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"

diff --git a/images/php-fpm/8.0.Dockerfile b/images/php-fpm/8.0.Dockerfile
@@ -5,7 +5,7 @@ FROM composer:latest as healthcheckbuilder
 
 RUN composer create-project --no-dev amazeeio/healthz-php /healthz-php v0.0.6
 
-FROM php:8.0.10-fpm-alpine3.13
+FROM php:8.0.10-fpm-alpine3.14
 
 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
 LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"

diff --git a/images/python/3.7.Dockerfile b/images/python/3.7.Dockerfile
@@ -1,6 +1,7 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons as commons
-FROM python:3.7.11-alpine3.13
+
+FROM python:3.7.11-alpine3.14
 
 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
 LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"

diff --git a/images/python/3.8.Dockerfile b/images/python/3.8.Dockerfile
@@ -1,7 +1,7 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons as commons
 
-FROM python:3.8.12-alpine3.13
+FROM python:3.8.12-alpine3.14
 
 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
 LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"

diff --git a/images/python/3.9.Dockerfile b/images/python/3.9.Dockerfile
@@ -1,7 +1,7 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons as commons
 
-FROM python:3.9.7-alpine3.13
+FROM python:3.9.7-alpine3.14
 
 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
 LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"

diff --git a/images/redis/5.Dockerfile b/images/redis/5.Dockerfile
@@ -1,6 +1,6 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons as commons
-FROM redis:5.0.12-alpine3.13
+FROM redis:5.0.13-alpine3.14
 
 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
 LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"

diff --git a/images/redis/6.Dockerfile b/images/redis/6.Dockerfile
@@ -1,6 +1,6 @@
 ARG IMAGE_REPO
 FROM ${IMAGE_REPO:-lagoon}/commons as commons
-FROM redis:6.2.4-alpine3.13
+FROM redis:6.2.4-alpine3.14
 
 LABEL org.opencontainers.image.authors="The Lagoon Authors" maintainer="The Lagoon Authors"
 LABEL org.opencontainers.image.source="https://github.com/uselagoon/lagoon-images" repository="https://github.com/uselagoon/lagoon-images"