Skip to content

Commit

Permalink
CI: fix alpine < 3.14 for direnv
Browse files Browse the repository at this point in the history
  • Loading branch information
@f3l1x
f3l1x committed Dec 20, 2023
1 parent cbbb7ff commit 7ed4b1a
Show file tree
Hide file tree
Showing 16 changed files with 34 additions and 18 deletions.
5 changes: 3 additions & 2 deletions Makefile
View file
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
DOCKER_IMAGE=dockette/ci
DOCKER_IMAGE?=dockette/ci
DOCKER_PLATFORM?=linux/amd64,linux/arm64

_docker-build-%: VERSION=$*
_docker-build-%:
docker buildx \
build \
--platform linux/amd64,linux/arm64 \
--platform ${DOCKER_PLATFORM} \
--pull \
-t ${DOCKER_IMAGE}:${VERSION} \
./${VERSION}
Expand Down
5 changes: 3 additions & 2 deletions node10/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ FROM dockette/alpine:3.10

ENV NODEJS_VERSION=10.19.0

RUN apk update && apk upgrade && \
RUN echo '@v314 http://dl-cdn.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories && \
apk update && apk upgrade && \
# DEPENDENCIES #############################################################
apk add --update bash git ca-certificates curl openssh tzdata make direnv && \
apk add --update bash git ca-certificates curl openssh tzdata make direnv@v314 && \
# NODEJS ###################################################################
apk add --update nodejs npm && \
# CLEAN UP #################################################################
Expand Down
3 changes: 2 additions & 1 deletion node11/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ FROM dockette/alpine:3.9
ENV NODEJS_VERSION=11.3.0

RUN echo '@community http://dl-cdn.alpinelinux.org/alpine/v3.9/community' >> /etc/apk/repositories && \
echo '@v314 http://dl-cdn.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories && \
apk update && apk upgrade && \
# DEPENDENCIES #############################################################
apk add --update bash git ca-certificates curl openssh tzdata make direnv && \
apk add --update bash git ca-certificates curl openssh tzdata make direnv@v314 && \
# NODEJS ###################################################################
apk add --update nodejs-current@community npm@community && \
# CLEAN UP #################################################################
Expand Down
3 changes: 2 additions & 1 deletion node12/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ FROM dockette/alpine:3.12
ENV NODEJS_VERSION=12.18.3

RUN echo '@community http://dl-cdn.alpinelinux.org/alpine/v3.12/community' >> /etc/apk/repositories && \
echo '@v314 http://dl-cdn.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories && \
apk update && apk upgrade && \
# DEPENDENCIES #############################################################
apk add --update bash git ca-certificates curl openssh tzdata make direnv && \
apk add --update bash git ca-certificates curl openssh tzdata make direnv@v314 && \
# NODEJS ###################################################################
apk add --update nodejs-current npm && \
# CLEAN UP #################################################################
Expand Down
3 changes: 2 additions & 1 deletion node13/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ FROM dockette/alpine:3.11
ENV NODEJS_VERSION=13.1.0

RUN echo '@community http://dl-cdn.alpinelinux.org/alpine/v3.11/community' >> /etc/apk/repositories && \
echo '@v314 http://dl-cdn.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories && \
apk update && apk upgrade && \
# DEPENDENCIES #############################################################
apk add --update bash git ca-certificates curl openssh tzdata make direnv && \
apk add --update bash git ca-certificates curl openssh tzdata make direnv@v314 && \
# NODEJS ###################################################################
apk add --update nodejs-current@community npm@community && \
# CLEAN UP #################################################################
Expand Down
3 changes: 2 additions & 1 deletion node14/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ FROM dockette/alpine:3.12
ENV NODEJS_VERSION=14.5.0

RUN echo '@community http://dl-cdn.alpinelinux.org/alpine/v3.12/community' >> /etc/apk/repositories && \
echo '@v314 http://dl-cdn.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories && \
apk update && apk upgrade && \
# DEPENDENCIES #############################################################
apk add --update bash git ca-certificates curl openssh tzdata make direnv && \
apk add --update bash git ca-certificates curl openssh tzdata make direnv@v314 && \
# NODEJS ###################################################################
apk add --update nodejs-current@community npm@community && \
# CLEAN UP #################################################################
Expand Down
3 changes: 2 additions & 1 deletion node15/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ FROM dockette/alpine:3.13
ENV NODEJS_VERSION=15.5.1

RUN echo '@community http://dl-cdn.alpinelinux.org/alpine/v3.13/community' >> /etc/apk/repositories && \
echo '@v314 http://dl-cdn.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories && \
apk update && apk upgrade && \
# DEPENDENCIES #############################################################
apk add --update bash git ca-certificates curl openssh tzdata make direnv && \
apk add --update bash git ca-certificates curl openssh tzdata make direnv@v314 && \
# NODEJS ###################################################################
apk add --update nodejs-current@community npm@community && \
# CLEAN UP #################################################################
Expand Down
3 changes: 2 additions & 1 deletion node6/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ FROM dockette/alpine:3.6
ENV NODEJS_VERSION=6.10.3

RUN echo '@main http://dl-cdn.alpinelinux.org/alpine/v3.6/main' >> /etc/apk/repositories && \
echo '@v314 http://dl-cdn.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories && \
apk update && apk upgrade && \
# DEPENDENCIES #############################################################
apk add --update bash git ca-certificates curl openssh tzdata make direnv && \
apk add --update bash git ca-certificates curl openssh tzdata make direnv@v314 && \
# NODEJS ###################################################################
apk add --update nodejs-npm@main && \
# CLEAN UP #################################################################
Expand Down
3 changes: 2 additions & 1 deletion node7/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ FROM dockette/alpine:3.6
ENV NODEJS_VERSION=7.10.1

RUN echo '@community http://dl-cdn.alpinelinux.org/alpine/v3.6/community' >> /etc/apk/repositories && \
echo '@v314 http://dl-cdn.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories && \
apk update && apk upgrade && \
# DEPENDENCIES #############################################################
apk add --update bash git ca-certificates curl openssh tzdata make direnv && \
apk add --update bash git ca-certificates curl openssh tzdata make direnv@v314 && \
# NODEJS ###################################################################
apk add --update nodejs-current-npm@community && \
# CLEAN UP #################################################################
Expand Down
3 changes: 2 additions & 1 deletion node8/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ FROM dockette/alpine:3.8
ENV NODEJS_VERSION=8.14.0

RUN echo '@main http://dl-cdn.alpinelinux.org/alpine/v3.8/main' >> /etc/apk/repositories && \
echo '@v314 http://dl-cdn.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories && \
apk update && apk upgrade && \
# DEPENDENCIES #############################################################
apk add --update bash git ca-certificates curl openssh tzdata make direnv && \
apk add --update bash git ca-certificates curl openssh tzdata make direnv@v314 && \
# NODEJS ###################################################################
apk add --update nodejs-current@main && \
# CLEAN UP #################################################################
Expand Down
3 changes: 2 additions & 1 deletion node9/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,10 @@ FROM dockette/alpine:3.8
ENV NODEJS_VERSION=9.11.1

RUN echo '@community http://dl-cdn.alpinelinux.org/alpine/v3.8/community' >> /etc/apk/repositories && \
echo '@v314 http://dl-cdn.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories && \
apk update && apk upgrade && \
# DEPENDENCIES #############################################################
apk add --update bash git ca-certificates curl openssh tzdata make direnv && \
apk add --update bash git ca-certificates curl openssh tzdata make direnv@v314 && \
# NODEJS ###################################################################
apk add --update nodejs-current@community npm@community && \
# CLEAN UP #################################################################
Expand Down
3 changes: 2 additions & 1 deletion php56/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ ENV TZ=Europe/Prague

RUN echo '@v310 http://dl-cdn.alpinelinux.org/alpine/v3.10/community' >> /etc/apk/repositories && \
echo '@v35 http://dl-cdn.alpinelinux.org/alpine/v3.5/community' >> /etc/apk/repositories && \
echo '@v314 http://dl-cdn.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories && \
# DEPENDENCIES #############################################################
apk update && \
apk upgrade && \
Expand All @@ -24,7 +25,7 @@ RUN echo '@v310 http://dl-cdn.alpinelinux.org/alpine/v3.10/community' >> /etc/ap
openssh \
tzdata \
make \
direnv \
direnv@v314 \
gnu-libiconv@v310 && \
# PHP ######################################################################
apk --no-cache add \
Expand Down
3 changes: 2 additions & 1 deletion php70/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so php"

RUN echo '@community http://dl-cdn.alpinelinux.org/alpine/v3.5/community' >> /etc/apk/repositories && \
echo '@v310 http://dl-cdn.alpinelinux.org/alpine/v3.10/community' >> /etc/apk/repositories && \
echo '@v314 http://dl-cdn.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories && \
# DEPENDENCIES #############################################################
apk update && \
apk upgrade && \
Expand All @@ -25,7 +26,7 @@ RUN echo '@community http://dl-cdn.alpinelinux.org/alpine/v3.5/community' >> /et
openssh \
tzdata \
make \
direnv \
direnv@v314 \
gnu-libiconv@v310 && \
# PHP ######################################################################
apk --no-cache add \
Expand Down
3 changes: 2 additions & 1 deletion php71/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so php"

RUN echo '@community http://dl-cdn.alpinelinux.org/alpine/v3.7/community' >> /etc/apk/repositories && \
echo '@v310 http://dl-cdn.alpinelinux.org/alpine/v3.10/community' >> /etc/apk/repositories && \
echo '@v314 http://dl-cdn.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories && \
# DEPENDENCIES #############################################################
apk update && \
apk upgrade && \
Expand All @@ -25,7 +26,7 @@ RUN echo '@community http://dl-cdn.alpinelinux.org/alpine/v3.7/community' >> /et
openssh \
tzdata \
make \
direnv \
direnv@v314 \
gnu-libiconv@v310 && \
# PHP ######################################################################
apk add --no-cache \
Expand Down
3 changes: 2 additions & 1 deletion php72/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so php"

RUN echo '@community http://dl-cdn.alpinelinux.org/alpine/v3.9/community' >> /etc/apk/repositories && \
echo '@v310 http://dl-cdn.alpinelinux.org/alpine/v3.10/community' >> /etc/apk/repositories && \
echo '@v314 http://dl-cdn.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories && \
# DEPENDENCIES #############################################################
apk update && \
apk upgrade && \
Expand All @@ -25,7 +26,7 @@ RUN echo '@community http://dl-cdn.alpinelinux.org/alpine/v3.9/community' >> /et
openssh \
tzdata \
make \
direnv \
direnv@v314 \
gnu-libiconv@v310 && \
# PHP ######################################################################
apk --no-cache add \
Expand Down
3 changes: 2 additions & 1 deletion php73/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ ENV TZ=Europe/Prague
ENV LD_PRELOAD="/usr/lib/preloadable_libiconv.so php"

RUN echo '@community http://dl-cdn.alpinelinux.org/alpine/v3.12/community' >> /etc/apk/repositories && \
echo '@v314 http://dl-cdn.alpinelinux.org/alpine/v3.14/community' >> /etc/apk/repositories && \
# DEPENDENCIES #############################################################
apk update && \
apk upgrade && \
Expand All @@ -24,7 +25,7 @@ RUN echo '@community http://dl-cdn.alpinelinux.org/alpine/v3.12/community' >> /e
openssh \
tzdata \
make \
direnv \
direnv@v314 \
gnu-libiconv@community && \
# PHP ######################################################################
apk --no-cache add \
Expand Down

0 comments on commit 7ed4b1a

Please sign in to comment.