Merge pull request #4689 from penpot/niwinz-devenv-upgrade

⬆️ Upgrade devenv linux distribution version

docker/devenv/Dockerfile

@@ -1,4 +1,4 @@
-FROM ubuntu:22.04
+FROM debian:bookworm
 LABEL maintainer="Andrey Antukh <niwi@niwi.nz>"
 
 ARG DEBIAN_FRONTEND=noninteractive
@@ -33,7 +33,6 @@ RUN set -ex; \
         unzip \
         rsync \
         fakeroot \
-        netcat \
         file \
         less \
         jq \
@@ -105,12 +104,12 @@ RUN set -eux; \
     ARCH="$(dpkg --print-architecture)"; \
     case "${ARCH}" in \
        aarch64|arm64) \
-         ESUM='3ce6a2b357e2ef45fd6b53d6587aa05bfec7771e7fb982f2c964f6b771b7526a'; \
-         BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2%2B13/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.2_13.tar.gz'; \
+         ESUM='7d3ab0e8eba95bd682cfda8041c6cb6fa21e09d0d9131316fd7c96c78969de31'; \
+         BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_aarch64_linux_hotspot_21.0.3_9.tar.gz'; \
          ;; \
        amd64|x86_64) \
-         ESUM='454bebb2c9fe48d981341461ffb6bf1017c7b7c6e15c6b0c29b959194ba3aaa5'; \
-         BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.2%2B13/OpenJDK21U-jdk_x64_linux_hotspot_21.0.2_13.tar.gz'; \
+         ESUM='fffa52c22d797b715a962e6c8d11ec7d79b90dd819b5bc51d62137ea4b22a340'; \
+         BINARY_URL='https://github.com/adoptium/temurin21-binaries/releases/download/jdk-21.0.3%2B9/OpenJDK21U-jdk_x64_linux_hotspot_21.0.3_9.tar.gz'; \
          ;; \
        *) \
          echo "Unsupported arch: ${ARCH}"; \
@@ -133,10 +132,11 @@ RUN set -ex; \
     rm -rf /tmp/clojure.sh;
 
 RUN set -ex; \
-    curl https://www.postgresql.org/media/keys/ACCC4CF8.asc | sudo apt-key add -; \
-    echo "deb http://apt.postgresql.org/pub/repos/apt jammy-pgdg main" >> /etc/apt/sources.list.d/postgresql.list; \
+    install -d /usr/share/postgresql-common/pgdg; \
+    curl -o /usr/share/postgresql-common/pgdg/apt.postgresql.org.asc --fail https://www.postgresql.org/media/keys/ACCC4CF8.asc; \
+    echo "deb [signed-by=/usr/share/postgresql-common/pgdg/apt.postgresql.org.asc] https://apt.postgresql.org/pub/repos/apt bookworm-pgdg main" >> /etc/apt/sources.list.d/postgresql.list; \
     apt-get -qq update; \
-    apt-get -qqy install postgresql-client-15; \
+    apt-get -qqy install postgresql-client-16; \
     rm -rf /var/lib/apt/lists/*;
 
 RUN set -eux; \
@@ -244,12 +244,6 @@ RUN set -ex; \
 
 WORKDIR /home
 
-EXPOSE 3447
-EXPOSE 3448
-EXPOSE 3449
-EXPOSE 6060
-EXPOSE 9090
-
 COPY files/nginx.conf /etc/nginx/nginx.conf
 COPY files/nginx-mime.types /etc/nginx/mime.types
 COPY files/phantomjs-mock /usr/bin/phantomjs

docker/devenv/docker-compose.yaml

@@ -8,7 +8,7 @@ networks:
         - subnet: 172.177.9.0/24
 
 volumes:
-  postgres_data_pg15:
+  postgres_data_pg16:
   user_data:
   minio_data:
   redis_data:
@@ -86,7 +86,7 @@ services:
       - 9001:9001
 
   postgres:
-    image: postgres:15
+    image: postgres:16
     command: postgres -c config_file=/etc/postgresql.conf
     restart: always
     stop_signal: SIGINT
@@ -98,7 +98,7 @@ services:
     volumes:
       - ./files/postgresql.conf:/etc/postgresql.conf:z
       - ./files/postgresql_init.sql:/docker-entrypoint-initdb.d/init.sql:z
-      - postgres_data_pg15:/var/lib/postgresql/data
+      - postgres_data_pg16:/var/lib/postgresql/data
 
   redis:
     image: redis:7

manage.sh

@@ -65,6 +65,12 @@ function start-devenv {
     docker compose -p $DEVENV_PNAME -f docker/devenv/docker-compose.yaml up -d;
 }
 
+function create-devenv {
+    pull-devenv-if-not-exists $@;
+
+    docker compose -p $DEVENV_PNAME -f docker/devenv/docker-compose.yaml create;
+}
+
 function stop-devenv {
     docker compose -p $DEVENV_PNAME -f docker/devenv/docker-compose.yaml stop -t 2;
 }
@@ -194,6 +200,7 @@ function usage {
     echo "Options:"
     echo "- pull-devenv                      Pulls docker development oriented image"
     echo "- build-devenv                     Build docker development oriented image"
+    echo "- create-devenv                    Create the development oriented docker compose service."
     echo "- start-devenv                     Start the development oriented docker compose service."
     echo "- stop-devenv                      Stops the development oriented docker compose service."
     echo "- drop-devenv                      Remove the development oriented docker compose containers, volumes and clean images."
@@ -223,6 +230,10 @@ case $1 in
         push-devenv ${@:2}
         ;;
 
+    create-devenv)
+        create-devenv ${@:2}
+        ;;
+
     start-devenv)
         start-devenv ${@:2}
         ;;