diff --git a/Dockerfile--altlinux_10.tmpl b/Dockerfile--altlinux_10.tmpl index ea5ae6b..3016858 100644 --- a/Dockerfile--altlinux_10.tmpl +++ b/Dockerfile--altlinux_10.tmpl @@ -2,7 +2,7 @@ ARG PG_VERSION ARG PYTHON_VERSION # --------------------------------------------- base1 -FROM alt:p10 as base1 +FROM alt:p10 AS base1 RUN apt-get update RUN apt-get install -y sudo curl ca-certificates @@ -19,7 +19,7 @@ EXPOSE 22 RUN ssh-keygen -A # --------------------------------------------- postgres -FROM base1 as base1_with_dev_tools +FROM base1 AS base1_with_dev_tools RUN apt-get update @@ -41,7 +41,7 @@ RUN apt-get install -y libzstd-devel RUN apt-get install -y libxml2-devel # --------------------------------------------- postgres -FROM base1_with_dev_tools as base1_with_pg-17 +FROM base1_with_dev_tools AS base1_with_pg-17 RUN git clone https://github.com/postgres/postgres.git -b REL_17_STABLE /pg/postgres/source @@ -60,7 +60,7 @@ RUN ln -s /pg/postgres/install/bin/pg_config -t /usr/local/bin RUN ln -s /pg/postgres/install/lib/libpq.so.5.17 /usr/lib64/libpq.so.5 # --------------------------------------------- base2_with_python-3 -FROM base1_with_pg-${PG_VERSION} as base2_with_python-3 +FROM base1_with_pg-${PG_VERSION} AS base2_with_python-3 RUN apt-get install -y python3 RUN apt-get install -y python3-dev RUN apt-get install -y python3-modules-sqlite3 @@ -68,7 +68,7 @@ RUN apt-get install -y python3-modules-sqlite3 ENV PYTHON_BINARY=python3 # --------------------------------------------- final -FROM base2_with_python-${PYTHON_VERSION} as final +FROM base2_with_python-${PYTHON_VERSION} AS final RUN adduser test -G wheel diff --git a/Dockerfile--altlinux_11.tmpl b/Dockerfile--altlinux_11.tmpl index f609e7b..3aa039d 100644 --- a/Dockerfile--altlinux_11.tmpl +++ b/Dockerfile--altlinux_11.tmpl @@ -2,7 +2,7 @@ ARG PG_VERSION ARG PYTHON_VERSION # --------------------------------------------- base1 -FROM alt:p11 as base1 +FROM alt:p11 AS base1 RUN apt-get update RUN apt-get install -y sudo curl ca-certificates @@ -22,7 +22,7 @@ EXPOSE 22 RUN ssh-keygen -A # --------------------------------------------- postgres -FROM base1 as base1_with_dev_tools +FROM base1 AS base1_with_dev_tools RUN apt-get update @@ -44,7 +44,7 @@ RUN apt-get install -y libzstd-devel RUN apt-get install -y libxml2-devel # --------------------------------------------- postgres -FROM base1_with_dev_tools as base1_with_pg-17 +FROM base1_with_dev_tools AS base1_with_pg-17 RUN git clone https://github.com/postgres/postgres.git -b REL_17_STABLE /pg/postgres/source @@ -63,7 +63,7 @@ RUN ln -s /pg/postgres/install/bin/pg_config -t /usr/local/bin RUN ln -s /pg/postgres/install/lib/libpq.so.5.17 /usr/lib64/libpq.so.5 # --------------------------------------------- base2_with_python-3 -FROM base1_with_pg-${PG_VERSION} as base2_with_python-3 +FROM base1_with_pg-${PG_VERSION} AS base2_with_python-3 RUN apt-get install -y python3 RUN apt-get install -y python3-dev RUN apt-get install -y python3-modules-sqlite3 @@ -71,7 +71,7 @@ RUN apt-get install -y python3-modules-sqlite3 ENV PYTHON_BINARY=python3 # --------------------------------------------- final -FROM base2_with_python-${PYTHON_VERSION} as final +FROM base2_with_python-${PYTHON_VERSION} AS final RUN adduser test -G wheel diff --git a/Dockerfile--std-all.tmpl b/Dockerfile--std-all.tmpl index d79275f..44cce91 100644 --- a/Dockerfile--std-all.tmpl +++ b/Dockerfile--std-all.tmpl @@ -2,15 +2,15 @@ ARG PG_VERSION ARG PYTHON_VERSION # --------------------------------------------- base1 -FROM postgres:${PG_VERSION}-alpine as base1 +FROM postgres:${PG_VERSION}-alpine AS base1 # --------------------------------------------- base2_with_python-3 -FROM base1 as base2_with_python-3 +FROM base1 AS base2_with_python-3 RUN apk add --no-cache curl python3 python3-dev build-base musl-dev linux-headers ENV PYTHON_BINARY=python3 # --------------------------------------------- final -FROM base2_with_python-${PYTHON_VERSION} as final +FROM base2_with_python-${PYTHON_VERSION} AS final #RUN apk add --no-cache mc RUN apk add --no-cache git diff --git a/Dockerfile--std.tmpl b/Dockerfile--std.tmpl index d661a55..cb72586 100644 --- a/Dockerfile--std.tmpl +++ b/Dockerfile--std.tmpl @@ -2,15 +2,15 @@ ARG PG_VERSION ARG PYTHON_VERSION # --------------------------------------------- base1 -FROM postgres:${PG_VERSION}-alpine as base1 +FROM postgres:${PG_VERSION}-alpine AS base1 # --------------------------------------------- base2_with_python-3 -FROM base1 as base2_with_python-3 +FROM base1 AS base2_with_python-3 RUN apk add --no-cache curl python3 python3-dev build-base musl-dev linux-headers ENV PYTHON_BINARY=python3 # --------------------------------------------- final -FROM base2_with_python-${PYTHON_VERSION} as final +FROM base2_with_python-${PYTHON_VERSION} AS final RUN apk add --no-cache git diff --git a/Dockerfile--std2-all.tmpl b/Dockerfile--std2-all.tmpl index 3c3c7d7..dcd061d 100644 --- a/Dockerfile--std2-all.tmpl +++ b/Dockerfile--std2-all.tmpl @@ -2,10 +2,10 @@ ARG PG_VERSION ARG PYTHON_VERSION # --------------------------------------------- base1 -FROM postgres:${PG_VERSION}-alpine as base1 +FROM postgres:${PG_VERSION}-alpine AS base1 # --------------------------------------------- base2_with_python-3 -FROM base1 as base2_with_python-3 +FROM base1 AS base2_with_python-3 ENV PYTHON_BINARY=python3 RUN apk add --no-cache curl python3 python3-dev build-base musl-dev linux-headers @@ -22,43 +22,43 @@ RUN apk add sqlite-dev RUN apk add bzip2-dev # --------------------------------------------- base3_with_python-3.7 -FROM base2_with_python-3 as base3_with_python-3.7 +FROM base2_with_python-3 AS base3_with_python-3.7 ENV PYTHON_VERSION=3.7 # --------------------------------------------- base3_with_python-3.8.0 -FROM base2_with_python-3 as base3_with_python-3.8.0 +FROM base2_with_python-3 AS base3_with_python-3.8.0 ENV PYTHON_VERSION=3.8.0 # --------------------------------------------- base3_with_python-3.8 -FROM base2_with_python-3 as base3_with_python-3.8 +FROM base2_with_python-3 AS base3_with_python-3.8 ENV PYTHON_VERSION=3.8 # --------------------------------------------- base3_with_python-3.9 -FROM base2_with_python-3 as base3_with_python-3.9 +FROM base2_with_python-3 AS base3_with_python-3.9 ENV PYTHON_VERSION=3.9 # --------------------------------------------- base3_with_python-3.10 -FROM base2_with_python-3 as base3_with_python-3.10 +FROM base2_with_python-3 AS base3_with_python-3.10 ENV PYTHON_VERSION=3.10 # --------------------------------------------- base3_with_python-3.11 -FROM base2_with_python-3 as base3_with_python-3.11 +FROM base2_with_python-3 AS base3_with_python-3.11 ENV PYTHON_VERSION=3.11 # --------------------------------------------- base3_with_python-3.12 -FROM base2_with_python-3 as base3_with_python-3.12 +FROM base2_with_python-3 AS base3_with_python-3.12 ENV PYTHON_VERSION=3.12 # --------------------------------------------- base3_with_python-3.13 -FROM base2_with_python-3 as base3_with_python-3.13 +FROM base2_with_python-3 AS base3_with_python-3.13 ENV PYTHON_VERSION=3.13 # --------------------------------------------- base3_with_python-3.14 -FROM base2_with_python-3 as base3_with_python-3.14 +FROM base2_with_python-3 AS base3_with_python-3.14 ENV PYTHON_VERSION=3.14 # --------------------------------------------- final -FROM base3_with_python-${PYTHON_VERSION} as final +FROM base3_with_python-${PYTHON_VERSION} AS final #RUN apk add --no-cache mc diff --git a/Dockerfile--ubuntu_24_04.tmpl b/Dockerfile--ubuntu_24_04.tmpl index 3083dfa..5858136 100644 --- a/Dockerfile--ubuntu_24_04.tmpl +++ b/Dockerfile--ubuntu_24_04.tmpl @@ -2,7 +2,7 @@ ARG PG_VERSION ARG PYTHON_VERSION # --------------------------------------------- base1 -FROM ubuntu:24.04 as base1 +FROM ubuntu:24.04 AS base1 ARG PG_VERSION RUN apt update @@ -31,12 +31,12 @@ EXPOSE 22 RUN ssh-keygen -A # --------------------------------------------- base2_with_python-3 -FROM base1 as base2_with_python-3 +FROM base1 AS base2_with_python-3 RUN apt install -y python3 python3-dev python3-venv libpq-dev build-essential ENV PYTHON_BINARY=python3 # --------------------------------------------- final -FROM base2_with_python-${PYTHON_VERSION} as final +FROM base2_with_python-${PYTHON_VERSION} AS final RUN apt install -y git