diff --git a/build.gradle b/build.gradle index 305c6b8b..65a4de98 100644 --- a/build.gradle +++ b/build.gradle @@ -198,6 +198,16 @@ file("ports.env").withInputStream { environmentMap.putAll ports } +file("versions.env").withInputStream { + versionsFile -> + + Properties versions = new Properties() + + versions.load(versionsFile) + + environmentMap.putAll versions +} + file('.env').withOutputStream { BufferedOutputStream envFileOutputStream -> diff --git a/compose-recipes/db2/Dockerfile b/compose-recipes/db2/Dockerfile index e88bbb0e..2d2c8513 100644 --- a/compose-recipes/db2/Dockerfile +++ b/compose-recipes/db2/Dockerfile @@ -1,4 +1,6 @@ -FROM icr.io/db2_community/db2:11.5.9.0 +ARG DB2_VERSION=11.5.9.0 + +FROM icr.io/db2_community/db2:${DB2_VERSION} RUN mkdir /var/custom RUN touch /startup_log.txt diff --git a/compose-recipes/db2/service.db2.yaml b/compose-recipes/db2/service.db2.yaml index b16b14d7..aa58d410 100644 --- a/compose-recipes/db2/service.db2.yaml +++ b/compose-recipes/db2/service.db2.yaml @@ -3,7 +3,10 @@ services: volumes: - db2:/container-data/db2 database: - build: ./compose-recipes/db2 + build: + args: + DB2_VERSION: ${DB2_VERSION} + context: ./compose-recipes/db2 container_name: ${NAMESPACE}-database-db2 environment: - COMPOSER_DATABASE_NAME=${DATABASE_NAME} diff --git a/compose-recipes/mariadb/Dockerfile b/compose-recipes/mariadb/Dockerfile index 34ebc189..236c6859 100644 --- a/compose-recipes/mariadb/Dockerfile +++ b/compose-recipes/mariadb/Dockerfile @@ -1,4 +1,6 @@ -FROM mariadb:10.6.22-jammy +ARG MARIADB_VERSION=10.6.22-jammy + +FROM mariadb:${MARIADB_VERSION} RUN touch /startup_log.txt RUN chown mysql:mysql /startup_log.txt diff --git a/compose-recipes/mariadb/service.mariadb.yaml b/compose-recipes/mariadb/service.mariadb.yaml index 6fa57673..197ad71a 100644 --- a/compose-recipes/mariadb/service.mariadb.yaml +++ b/compose-recipes/mariadb/service.mariadb.yaml @@ -3,7 +3,10 @@ services: volumes: - mariadb:/container-data/mariadb database: - build: ./compose-recipes/mariadb + build: + args: + MARIADB_VERSION: ${MARIADB_VERSION} + context: ./compose-recipes/mariadb container_name: ${NAMESPACE}-database-mariadb environment: - MARIADB_ALLOW_EMPTY_ROOT_PASSWORD=1 diff --git a/compose-recipes/mysql/Dockerfile b/compose-recipes/mysql/Dockerfile index 9cd6bf05..d6d17809 100644 --- a/compose-recipes/mysql/Dockerfile +++ b/compose-recipes/mysql/Dockerfile @@ -1,4 +1,6 @@ -FROM mysql:8.4.5-oracle +ARG MYSQL_VERSION=8.4.5-oracle + +FROM mysql:${MYSQL_VERSION} RUN touch /startup_log.txt RUN chown mysql:mysql /startup_log.txt diff --git a/compose-recipes/mysql/service.mysql.yaml b/compose-recipes/mysql/service.mysql.yaml index 4e49a8fb..845b2aa9 100644 --- a/compose-recipes/mysql/service.mysql.yaml +++ b/compose-recipes/mysql/service.mysql.yaml @@ -3,7 +3,10 @@ services: volumes: - mysql:/container-data/mysql database: - build: ./compose-recipes/mysql + build: + args: + MYSQL_VERSION: ${MYSQL_VERSION} + context: ./compose-recipes/mysql container_name: ${NAMESPACE}-database-mysql environment: - MYSQL_ALLOW_EMPTY_PASSWORD=1 diff --git a/compose-recipes/postgres/Dockerfile b/compose-recipes/postgres/Dockerfile index d182cf14..ef4d5429 100644 --- a/compose-recipes/postgres/Dockerfile +++ b/compose-recipes/postgres/Dockerfile @@ -1,4 +1,6 @@ -FROM postgres:16.3 +ARG POSTGRES_VERSION=16.3 + +FROM postgres:${POSTGRES_VERSION} # Create a log file and give ownership to postgres diff --git a/compose-recipes/postgres/service.postgres.yaml b/compose-recipes/postgres/service.postgres.yaml index be427780..03c1dc85 100644 --- a/compose-recipes/postgres/service.postgres.yaml +++ b/compose-recipes/postgres/service.postgres.yaml @@ -3,7 +3,10 @@ services: volumes: - postgres:/container-data/postgres database: - build: ./compose-recipes/postgres + build: + args: + POSTGRES_VERSION: ${POSTGRES_VERSION} + context: ./compose-recipes/postgres container_name: ${NAMESPACE}-database-postgres deploy: resources: diff --git a/compose-recipes/sqlserver/Dockerfile b/compose-recipes/sqlserver/Dockerfile index 4748d13d..5b8e89c6 100644 --- a/compose-recipes/sqlserver/Dockerfile +++ b/compose-recipes/sqlserver/Dockerfile @@ -1,4 +1,6 @@ -FROM mcr.microsoft.com/mssql/server:2022-CU21-ubuntu-22.04 +ARG SQLSERVER_VERSION=2022-CU21-ubuntu-22.04 + +FROM mcr.microsoft.com/mssql/server:${SQLSERVER_VERSION} USER root diff --git a/compose-recipes/sqlserver/service.sqlserver.yaml b/compose-recipes/sqlserver/service.sqlserver.yaml index 7bb7ba6d..e4679643 100644 --- a/compose-recipes/sqlserver/service.sqlserver.yaml +++ b/compose-recipes/sqlserver/service.sqlserver.yaml @@ -3,7 +3,10 @@ services: volumes: - sqlserver:/container-data/sqlserver database: - build: ./compose-recipes/sqlserver + build: + args: + SQLSERVER_VERSION: ${SQLSERVER_VERSION} + context: ./compose-recipes/sqlserver container_name: ${NAMESPACE}-database-sqlserver deploy: resources: diff --git a/versions.env b/versions.env new file mode 100644 index 00000000..644ac0cd --- /dev/null +++ b/versions.env @@ -0,0 +1,5 @@ +DB2_VERSION=11.5.9.0 +MARIADB_VERSION=10.6.22-jammy +MYSQL_VERSION=8.4.5-oracle +POSTGRES_VERSION=16.3 +SQLSERVER_VERSION=2022-CU21-ubuntu-22.04 \ No newline at end of file