Adopt ubuntu base for docker images

ref DEV-1379
authgear · Jun 21, 2024 · a90cc80 · a90cc80
2 parents 824c914 + 495bf52
commit a90cc80
Show file tree

Hide file tree

Showing 4 changed files with 31 additions and 31 deletions.
diff --git a/cmd/authgear/Dockerfile b/cmd/authgear/Dockerfile
@@ -1,5 +1,5 @@
 # Stage 1: Build the Go binary
-FROM golang:1.22.4-bookworm as stage1
+FROM quay.io/theauthgear/golang:1.22.4-noble as stage1
 
 # Install build time C dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -32,10 +32,10 @@ COPY . .
 RUN make authui GIT_HASH=$GIT_HASH
 
 # Stage 3: Prepare the actual fs we use to run the program
-FROM debian:bookworm-slim
+FROM ubuntu:noble
 ARG GIT_HASH
 WORKDIR /app
-# /etc/mime.types (mime-support)
+# /etc/mime.types (media-types)
 # /usr/share/ca-certificates/*/* (ca-certificates)
 # /usr/share/zoneinfo/ (tzdata)
 RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -44,9 +44,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     libmagic-dev \
     libmagic-mgc \
     ca-certificates \
-    mime-support \
+    media-types \
     tzdata \
-    && rm -rf /var/lib/apt/lists/*
+    && apt-get upgrade -y && rm -rf /var/lib/apt/lists/*
 RUN update-ca-certificates
 COPY ./GeoLite2-Country.mmdb ./GeoLite2-Country.mmdb
 COPY ./migrations ./migrations

diff --git a/cmd/portal/Dockerfile b/cmd/portal/Dockerfile
@@ -1,5 +1,5 @@
 # Stage 1: Build the Go binary
-FROM golang:1.22.4-bookworm as stage1
+FROM quay.io/theauthgear/golang:1.22.4-noble as stage1
 
 # Install build time C dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -42,10 +42,10 @@ COPY ./portal .
 RUN npm run build
 
 # Stage 4: Prepare the actual fs we use to run the program
-FROM debian:bookworm-slim
+FROM ubuntu:noble
 ARG GIT_HASH
 WORKDIR /app
-# /etc/mime.types (mime-support)
+# /etc/mime.types (media-types)
 # /usr/share/ca-certificates/*/* (ca-certificates)
 # /usr/share/zoneinfo/ (tzdata)
 RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -54,9 +54,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     libmagic-dev \
     libmagic-mgc \
     ca-certificates \
-    mime-support \
+    media-types \
     tzdata \
-    && rm -rf /var/lib/apt/lists/*
+    && apt-get upgrade -y && rm -rf /var/lib/apt/lists/*
 RUN update-ca-certificates
 COPY ./GeoLite2-Country.mmdb ./GeoLite2-Country.mmdb
 COPY ./migrations ./migrations

diff --git a/custombuild/cmd/authgearx/Dockerfile b/custombuild/cmd/authgearx/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 # Stage 1: Build the Go binary
-FROM golang:1.22.4-bookworm as stage1
+FROM quay.io/theauthgear/golang:1.22.4-noble as stage1
 
 # Install build time C dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -50,10 +50,10 @@ COPY . .
 RUN make authui GIT_HASH=$GIT_HASH
 
 # Stage 3: Prepare the actual fs we use to run the program
-FROM debian:bookworm-slim
+FROM ubuntu:noble
 ARG GIT_HASH
 WORKDIR /app
-# /etc/mime.types (mime-support)
+# /etc/mime.types (media-types)
 # /usr/share/ca-certificates/*/* (ca-certificates)
 # /usr/share/zoneinfo/ (tzdata)
 RUN apt-get update && apt-get install -y --no-install-recommends \
@@ -62,9 +62,9 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
     libmagic-dev \
     libmagic-mgc \
     ca-certificates \
-    mime-support \
+    media-types \
     tzdata \
-    && rm -rf /var/lib/apt/lists/*
+    && apt-get upgrade -y && rm -rf /var/lib/apt/lists/*
 RUN update-ca-certificates
 COPY ./GeoLite2-Country.mmdb ./GeoLite2-Country.mmdb
 COPY ./migrations ./migrations

diff --git a/custombuild/cmd/portalx/Dockerfile b/custombuild/cmd/portalx/Dockerfile
@@ -1,15 +1,15 @@
 # syntax=docker/dockerfile:1
 
 # Stage 1: Build the Go binary
-FROM golang:1.22.4-bookworm as stage1
+FROM quay.io/theauthgear/golang:1.22.4-noble as stage1
 
 # Install build time C dependencies
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    pkg-config \
-    libicu-dev \
-    libvips-dev \
-    libmagic-dev \
-    && rm -rf /var/lib/apt/lists/*
+  pkg-config \
+  libicu-dev \
+  libvips-dev \
+  libmagic-dev \
+  && rm -rf /var/lib/apt/lists/*
 
 # In order to build a Go program that uses private modules in Docker,
 # we need the following
@@ -60,21 +60,21 @@ COPY ./portal .
 RUN npm run build
 
 # Stage 4: Prepare the actual fs we use to run the program
-FROM debian:bookworm-slim
+FROM ubuntu:noble
 ARG GIT_HASH
 WORKDIR /app
-# /etc/mime.types (mime-support)
+# /etc/mime.types (media-types)
 # /usr/share/ca-certificates/*/* (ca-certificates)
 # /usr/share/zoneinfo/ (tzdata)
 RUN apt-get update && apt-get install -y --no-install-recommends \
-    libicu-dev \
-    libvips-dev \
-    libmagic-dev \
-    libmagic-mgc \
-    ca-certificates \
-    mime-support \
-    tzdata \
-    && rm -rf /var/lib/apt/lists/*
+  libicu-dev \
+  libvips-dev \
+  libmagic-dev \
+  libmagic-mgc \
+  ca-certificates \
+  media-types \
+  tzdata \
+  && apt-get upgrade -y && rm -rf /var/lib/apt/lists/*
 RUN update-ca-certificates
 COPY ./GeoLite2-Country.mmdb ./GeoLite2-Country.mmdb
 COPY ./migrations ./migrations