update dockerfiles
This commit is contained in:
@@ -2,15 +2,15 @@ FROM alpine:3.17
|
|||||||
|
|
||||||
ARG TARGETPLATFORM
|
ARG TARGETPLATFORM
|
||||||
# https://download.docker.com/linux/static/stable/
|
# https://download.docker.com/linux/static/stable/
|
||||||
ARG DOCKER_VERSION=23.0.5
|
ARG DOCKER_VERSION=24.0.2
|
||||||
# https://github.com/docker/compose/releases
|
# https://github.com/docker/compose/releases
|
||||||
ARG DOCKER_COMPOSE_VERSION=2.17.3
|
ARG DOCKER_COMPOSE_VERSION=2.19.1
|
||||||
# https://github.com/docker/buildx/releases
|
# https://github.com/docker/buildx/releases
|
||||||
ARG DOCKER_BUILDX_VERSION=0.10.4
|
ARG DOCKER_BUILDX_VERSION=0.10.5
|
||||||
# https://github.com/buildpacks/pack/releases
|
# https://github.com/buildpacks/pack/releases
|
||||||
ARG PACK_VERSION=0.29.0
|
ARG PACK_VERSION=0.29.0
|
||||||
# https://github.com/railwayapp/nixpacks/releases
|
# https://github.com/railwayapp/nixpacks/releases
|
||||||
ARG NIXPACKS_VERSION=1.6.1
|
ARG NIXPACKS_VERSION=1.9.0
|
||||||
|
|
||||||
USER root
|
USER root
|
||||||
WORKDIR /artifacts
|
WORKDIR /artifacts
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
FROM serversideup/php:8.2-fpm-nginx
|
FROM serversideup/php:8.2-fpm-nginx
|
||||||
ARG POSTGRES_VERSION=15
|
ARG POSTGRES_VERSION=15
|
||||||
RUN apt-get update && apt-get install -y php-pgsql openssh-client git git-lfs jq
|
RUN apt-get update && apt-get install -y php-pgsql postgresql-client openssh-client git git-lfs jq
|
||||||
RUN apt-get -y autoremove && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
|
RUN apt-get -y autoremove && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
|
||||||
|
|
||||||
COPY docker/dev-ssu/nginx.conf /etc/nginx/conf.d/custom.conf
|
COPY docker/dev-ssu/nginx.conf /etc/nginx/conf.d/custom.conf
|
||||||
|
|||||||
@@ -7,7 +7,7 @@ RUN npm run build
|
|||||||
FROM serversideup/php:8.2-fpm-nginx
|
FROM serversideup/php:8.2-fpm-nginx
|
||||||
WORKDIR /var/www/html
|
WORKDIR /var/www/html
|
||||||
ARG POSTGRES_VERSION=15
|
ARG POSTGRES_VERSION=15
|
||||||
RUN apt-get update && apt-get install -y php-pgsql openssh-client git git-lfs jq
|
RUN apt-get update && apt-get install -y php-pgsql postgresql-client openssh-client git git-lfs jq
|
||||||
RUN apt-get -y autoremove && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
|
RUN apt-get -y autoremove && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* /usr/share/doc/*
|
||||||
|
|
||||||
COPY docker/prod-ssu/nginx.conf /etc/nginx/conf.d/custom.conf
|
COPY docker/prod-ssu/nginx.conf /etc/nginx/conf.d/custom.conf
|
||||||
|
|||||||
@@ -2,19 +2,19 @@ FROM alpine:3.17
|
|||||||
|
|
||||||
ARG TARGETPLATFORM
|
ARG TARGETPLATFORM
|
||||||
# https://download.docker.com/linux/static/stable/
|
# https://download.docker.com/linux/static/stable/
|
||||||
ARG DOCKER_VERSION=23.0.5
|
ARG DOCKER_VERSION=24.0.2
|
||||||
# https://github.com/docker/compose/releases
|
# https://github.com/docker/compose/releases
|
||||||
ARG DOCKER_COMPOSE_VERSION=2.17.3
|
ARG DOCKER_COMPOSE_VERSION=2.19.1
|
||||||
# https://github.com/docker/buildx/releases
|
# https://github.com/docker/buildx/releases
|
||||||
ARG DOCKER_BUILDX_VERSION=0.10.4
|
ARG DOCKER_BUILDX_VERSION=0.10.5
|
||||||
# https://github.com/buildpacks/pack/releases
|
# https://github.com/buildpacks/pack/releases
|
||||||
ARG PACK_VERSION=0.29.0
|
ARG PACK_VERSION=0.29.0
|
||||||
# https://github.com/railwayapp/nixpacks/releases
|
# https://github.com/railwayapp/nixpacks/releases
|
||||||
ARG NIXPACKS_VERSION=1.6.1
|
ARG NIXPACKS_VERSION=1.9.0
|
||||||
|
|
||||||
USER root
|
USER root
|
||||||
WORKDIR /root
|
WORKDIR /root
|
||||||
RUN apk add --no-cache bash curl git git-lfs openssh-client openssh-server tar tini
|
RUN apk add --no-cache bash curl git git-lfs openssh-client openssh-server tar tini postgresql-client
|
||||||
RUN mkdir -p ~/.docker/cli-plugins
|
RUN mkdir -p ~/.docker/cli-plugins
|
||||||
RUN if [[ ${TARGETPLATFORM} == 'linux/amd64' ]]; then \
|
RUN if [[ ${TARGETPLATFORM} == 'linux/amd64' ]]; then \
|
||||||
curl -sSL https://github.com/docker/buildx/releases/download/v${DOCKER_BUILDX_VERSION}/buildx-v${DOCKER_BUILDX_VERSION}.linux-amd64 -o ~/.docker/cli-plugins/docker-buildx && \
|
curl -sSL https://github.com/docker/buildx/releases/download/v${DOCKER_BUILDX_VERSION}/buildx-v${DOCKER_BUILDX_VERSION}.linux-amd64 -o ~/.docker/cli-plugins/docker-buildx && \
|
||||||
|
|||||||
Reference in New Issue
Block a user