From 80241adafce51f48c7e1953532457b0e3b93bdeb Mon Sep 17 00:00:00 2001 From: Guillaume Lours <705411+glours@users.noreply.github.com> Date: Tue, 4 Oct 2022 14:48:35 +0200 Subject: [PATCH 1/3] follow the compose specification and remove all version property in compose files Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com> --- README.md | 4 ++-- docker-compose-javaworker.yml => compose-javaworker.yml | 2 -- docker-compose-k8s.yml => compose-k8s.yml | 2 -- docker-compose-simple.yml => compose-simple.yml | 2 -- docker-compose-windows-1809.yml => compose-windows-1809.yml | 2 -- docker-compose-windows.yml => compose-windows.yml | 2 -- docker-compose.seed.yml => compose.seed.yml | 0 docker-compose.yml => compose.yml | 0 result/docker-compose.test.yml | 2 -- 9 files changed, 2 insertions(+), 14 deletions(-) rename docker-compose-javaworker.yml => compose-javaworker.yml (98%) rename docker-compose-k8s.yml => compose-k8s.yml (97%) rename docker-compose-simple.yml => compose-simple.yml (97%) rename docker-compose-windows-1809.yml => compose-windows-1809.yml (98%) rename docker-compose-windows.yml => compose-windows.yml (98%) rename docker-compose.seed.yml => compose.seed.yml (100%) rename docker-compose.yml => compose.yml (100%) diff --git a/README.md b/README.md index 2aeaac973b..54104b8b42 100644 --- a/README.md +++ b/README.md @@ -37,13 +37,13 @@ An alternative version of the app uses Windows containers based on Nano Server. You can build from source using: ``` -docker-compose -f docker-compose-windows.yml build +docker-compose -f compose-windows.yml build ``` Then run the app using: ``` -docker-compose -f docker-compose-windows.yml up -d +docker-compose -f compose-windows.yml up -d ``` > Or in a Windows swarm, run `docker stack deploy -c docker-stack-windows.yml vote` diff --git a/docker-compose-javaworker.yml b/compose-javaworker.yml similarity index 98% rename from docker-compose-javaworker.yml rename to compose-javaworker.yml index 544865b986..7ff0821016 100644 --- a/docker-compose-javaworker.yml +++ b/compose-javaworker.yml @@ -1,5 +1,3 @@ -version: "3" - services: vote: build: ./vote diff --git a/docker-compose-k8s.yml b/compose-k8s.yml similarity index 97% rename from docker-compose-k8s.yml rename to compose-k8s.yml index 2c756dd8b1..280ec54e13 100644 --- a/docker-compose-k8s.yml +++ b/compose-k8s.yml @@ -1,5 +1,3 @@ -version: '3' - services: redis: image: redis:alpine diff --git a/docker-compose-simple.yml b/compose-simple.yml similarity index 97% rename from docker-compose-simple.yml rename to compose-simple.yml index f8454efa1d..34d1272996 100644 --- a/docker-compose-simple.yml +++ b/compose-simple.yml @@ -1,5 +1,3 @@ -version: "3" - services: vote: build: ./vote diff --git a/docker-compose-windows-1809.yml b/compose-windows-1809.yml similarity index 98% rename from docker-compose-windows-1809.yml rename to compose-windows-1809.yml index 8c5c11e44b..aff3520b57 100644 --- a/docker-compose-windows-1809.yml +++ b/compose-windows-1809.yml @@ -1,5 +1,3 @@ -version: "3.2" - services: vote: image: dockersamples/examplevotingapp_vote:dotnet-nanoserver-1809 diff --git a/docker-compose-windows.yml b/compose-windows.yml similarity index 98% rename from docker-compose-windows.yml rename to compose-windows.yml index 40372381b7..e88ca8ee1a 100644 --- a/docker-compose-windows.yml +++ b/compose-windows.yml @@ -1,5 +1,3 @@ -version: "3.2" - services: vote: image: dockersamples/examplevotingapp_vote:dotnet-nanoserver-sac2016 diff --git a/docker-compose.seed.yml b/compose.seed.yml similarity index 100% rename from docker-compose.seed.yml rename to compose.seed.yml diff --git a/docker-compose.yml b/compose.yml similarity index 100% rename from docker-compose.yml rename to compose.yml diff --git a/result/docker-compose.test.yml b/result/docker-compose.test.yml index 42e15e47fd..180a3e485f 100644 --- a/result/docker-compose.test.yml +++ b/result/docker-compose.test.yml @@ -1,5 +1,3 @@ -version: '2' - services: sut: From 6f8afec1c7b977c0921b8a05f363c4551c4e29f5 Mon Sep 17 00:00:00 2001 From: Guillaume Lours <705411+glours@users.noreply.github.com> Date: Tue, 4 Oct 2022 15:52:43 +0200 Subject: [PATCH 2/3] update versions of Dockerfile base images Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com> --- compose.yml | 2 +- result/Dockerfile | 2 +- seed-data/Dockerfile | 2 +- vote/Dockerfile | 2 +- worker/Dockerfile | 4 ++-- worker/Dockerfile.j | 4 ++-- worker/dotnet/Dockerfile | 4 ++-- worker/dotnet/Worker/Worker.csproj | 18 +++++++++--------- worker/src/Worker/Worker.csproj | 8 ++++---- 9 files changed, 23 insertions(+), 23 deletions(-) diff --git a/compose.yml b/compose.yml index 46f53d7cb0..d27989498f 100644 --- a/compose.yml +++ b/compose.yml @@ -57,7 +57,7 @@ services: - back-tier db: - image: postgres:9.4 + image: postgres:12.12-bullseye environment: POSTGRES_USER: "postgres" POSTGRES_PASSWORD: "postgres" diff --git a/result/Dockerfile b/result/Dockerfile index ff635a25f9..0eebfdcd55 100644 --- a/result/Dockerfile +++ b/result/Dockerfile @@ -1,4 +1,4 @@ -FROM node:10-slim +FROM node:18.0-bullseye-slim # add curl for healthcheck RUN apt-get update \ diff --git a/seed-data/Dockerfile b/seed-data/Dockerfile index 18e55e8429..139c498c55 100644 --- a/seed-data/Dockerfile +++ b/seed-data/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.9-slim +FROM python:3.10-bullseye # add apache bench (ab) tool RUN apt-get update \ diff --git a/vote/Dockerfile b/vote/Dockerfile index 9b04d669de..80f2e4557c 100644 --- a/vote/Dockerfile +++ b/vote/Dockerfile @@ -1,5 +1,5 @@ # Using official python runtime base image -FROM python:3.9-slim +FROM python:3.10-bullseye # add curl for healthcheck RUN apt-get update \ diff --git a/worker/Dockerfile b/worker/Dockerfile index 89739f868a..7b3da7b647 100644 --- a/worker/Dockerfile +++ b/worker/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as builder +FROM mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim as builder WORKDIR /Worker COPY src/Worker/Worker.csproj . @@ -8,7 +8,7 @@ COPY src/Worker/ . RUN dotnet publish -c Release -o /out Worker.csproj # app image -FROM mcr.microsoft.com/dotnet/core/runtime:3.1 +FROM mcr.microsoft.com/dotnet/runtime:6.0-bullseye-slim WORKDIR /app ENTRYPOINT ["dotnet", "Worker.dll"] diff --git a/worker/Dockerfile.j b/worker/Dockerfile.j index 85c33a5e9e..05159da32a 100644 --- a/worker/Dockerfile.j +++ b/worker/Dockerfile.j @@ -1,4 +1,4 @@ -FROM maven:3.5-jdk-8-alpine AS build +FROM maven:3.8.6-eclipse-temurin-19-focal AS build WORKDIR /code @@ -10,7 +10,7 @@ RUN ["mvn", "verify"] COPY ["src/main", "/code/src/main"] RUN ["mvn", "package"] -FROM openjdk:8-jre-alpine +FROM eclipse-temurin:19_36-jre-jammy COPY --from=build /code/target/worker-jar-with-dependencies.jar / diff --git a/worker/dotnet/Dockerfile b/worker/dotnet/Dockerfile index f87478ebb2..1e1027caa2 100644 --- a/worker/dotnet/Dockerfile +++ b/worker/dotnet/Dockerfile @@ -1,4 +1,4 @@ -FROM microsoft/dotnet:2.1-sdk-nanoserver-sac2016 as builder +FROM mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim as builder WORKDIR /Worker COPY Worker/Worker.csproj . @@ -8,7 +8,7 @@ COPY /Worker . RUN dotnet publish -c Release -o /out Worker.csproj # app image -FROM microsoft/dotnet:2.1-runtime-nanoserver-sac2016 +FROM mcr.microsoft.com/dotnet/runtime:6.0-bullseye-slim WORKDIR /app ENTRYPOINT ["dotnet", "Worker.dll"] diff --git a/worker/dotnet/Worker/Worker.csproj b/worker/dotnet/Worker/Worker.csproj index d85a98c1a8..9ff450930a 100644 --- a/worker/dotnet/Worker/Worker.csproj +++ b/worker/dotnet/Worker/Worker.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp3.1 + netcoreapp6.0 @@ -17,14 +17,14 @@ - - - - - - - - + + + + + + + + diff --git a/worker/src/Worker/Worker.csproj b/worker/src/Worker/Worker.csproj index 88e9a90eda..437e30763c 100644 --- a/worker/src/Worker/Worker.csproj +++ b/worker/src/Worker/Worker.csproj @@ -2,13 +2,13 @@ Exe - netcoreapp3.1 + netcoreapp6.0 - - - + + + \ No newline at end of file From e5728af28f58cada38117181af3853dc16f0be85 Mon Sep 17 00:00:00 2001 From: Guillaume Lours <705411+glours@users.noreply.github.com> Date: Tue, 4 Oct 2022 17:00:05 +0200 Subject: [PATCH 3/3] add buildplatform to first target of all Dockerfile to ensure compilation step is done using the user platform Signed-off-by: Guillaume Lours <705411+glours@users.noreply.github.com> --- result/Dockerfile | 2 +- seed-data/Dockerfile | 2 +- vote/Dockerfile | 2 +- worker/Dockerfile | 2 +- worker/Dockerfile.j | 2 +- worker/dotnet/Dockerfile | 2 +- worker/dotnet/Dockerfile.1809 | 2 +- 7 files changed, 7 insertions(+), 7 deletions(-) diff --git a/result/Dockerfile b/result/Dockerfile index 0eebfdcd55..9d4b4d76b0 100644 --- a/result/Dockerfile +++ b/result/Dockerfile @@ -1,4 +1,4 @@ -FROM node:18.0-bullseye-slim +FROM --platform=$BUILDPLATFORM node:18.0-bullseye-slim # add curl for healthcheck RUN apt-get update \ diff --git a/seed-data/Dockerfile b/seed-data/Dockerfile index 139c498c55..babd9eb2b6 100644 --- a/seed-data/Dockerfile +++ b/seed-data/Dockerfile @@ -1,4 +1,4 @@ -FROM python:3.10-bullseye +FROM --platform=$BUILDPLATFORM python:3.10-bullseye # add apache bench (ab) tool RUN apt-get update \ diff --git a/vote/Dockerfile b/vote/Dockerfile index 80f2e4557c..1ddef3888d 100644 --- a/vote/Dockerfile +++ b/vote/Dockerfile @@ -1,5 +1,5 @@ # Using official python runtime base image -FROM python:3.10-bullseye +FROM --platform=$BUILDPLATFORM python:3.10-bullseye # add curl for healthcheck RUN apt-get update \ diff --git a/worker/Dockerfile b/worker/Dockerfile index 7b3da7b647..f18b0ba985 100644 --- a/worker/Dockerfile +++ b/worker/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim as builder +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim as builder WORKDIR /Worker COPY src/Worker/Worker.csproj . diff --git a/worker/Dockerfile.j b/worker/Dockerfile.j index 05159da32a..a3756ad2a5 100644 --- a/worker/Dockerfile.j +++ b/worker/Dockerfile.j @@ -1,4 +1,4 @@ -FROM maven:3.8.6-eclipse-temurin-19-focal AS build +FROM --platform=$BUILDPLATFORM maven:3.8.6-eclipse-temurin-19-focal AS build WORKDIR /code diff --git a/worker/dotnet/Dockerfile b/worker/dotnet/Dockerfile index 1e1027caa2..14551e7ff2 100644 --- a/worker/dotnet/Dockerfile +++ b/worker/dotnet/Dockerfile @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim as builder +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/sdk:6.0-bullseye-slim as builder WORKDIR /Worker COPY Worker/Worker.csproj . diff --git a/worker/dotnet/Dockerfile.1809 b/worker/dotnet/Dockerfile.1809 index 4f1b9d28ac..70303d5a7b 100644 --- a/worker/dotnet/Dockerfile.1809 +++ b/worker/dotnet/Dockerfile.1809 @@ -1,4 +1,4 @@ -FROM mcr.microsoft.com/dotnet/core/sdk:3.1 as builder +FROM --platform=$BUILDPLATFORM mcr.microsoft.com/dotnet/core/sdk:3.1 as builder WORKDIR /Worker COPY Worker/Worker.csproj .