From e74f1354949967465c04b08b60cb28645d77c125 Mon Sep 17 00:00:00 2001 From: Michael Hohn Date: Mon, 30 Jun 2025 16:02:39 -0700 Subject: [PATCH] updated dockerfiles and READMEs to v0.4.0 --- containers/agent/Dockerfile | 2 +- containers/agent/README.org | 4 +++- containers/ghmrva/Dockerfile | 2 +- containers/hepc/README.org | 5 +++++ containers/server/Dockerfile | 2 +- containers/server/README.org | 5 ++++- containers/vscode/Dockerfile | 2 +- containers/vscode/README.org | 17 +++++++++++------ 8 files changed, 27 insertions(+), 12 deletions(-) diff --git a/containers/agent/Dockerfile b/containers/agent/Dockerfile index f69a2d9..d60fc32 100644 --- a/containers/agent/Dockerfile +++ b/containers/agent/Dockerfile @@ -18,7 +18,7 @@ RUN go mod tidy && go build -o /app/mrvaagent-binary # RUN go mod download # Create a runtime container -FROM ubuntu:24.10 as runner +FROM ubuntu:24.10 AS runner ENV DEBIAN_FRONTEND=noninteractive # Build argument for CodeQL version, defaulting to the latest release diff --git a/containers/agent/README.org b/containers/agent/README.org index 2610c76..a826471 100644 --- a/containers/agent/README.org +++ b/containers/agent/README.org @@ -19,7 +19,9 @@ - Tag the container. This is sufficient for further use on the local machine. #+BEGIN_SRC sh - docker tag ${MAG_TARGET} ghcr.io/hohn/mrva-agent:0.4.0 + cd ~/work-gh/mrva/mrva-docker/containers/agent &&\ + docker tag mrva-agent:0.4.0 \ + ghcr.io/hohn/mrva-agent:0.4.0 #+END_SRC - Push this container diff --git a/containers/ghmrva/Dockerfile b/containers/ghmrva/Dockerfile index a91df9a..d2aeb88 100644 --- a/containers/ghmrva/Dockerfile +++ b/containers/ghmrva/Dockerfile @@ -18,7 +18,7 @@ RUN go build . # ###################### # Provide codeql and java # -FROM ubuntu:24.10 as runner +FROM ubuntu:24.10 AS runner ENV DEBIAN_FRONTEND=noninteractive # Build argument for CodeQL version, defaulting to the latest release diff --git a/containers/hepc/README.org b/containers/hepc/README.org index d6974b1..e4c55f1 100644 --- a/containers/hepc/README.org +++ b/containers/hepc/README.org @@ -12,6 +12,11 @@ # Build with full output, e.g. RUN ls docker build --progress=plain --no-cache -t mrva-hepc-container:0.4.0 -f Dockerfile . + # tag it + cd ~/work-gh/mrva/mrva-docker/containers/hepc &&\ + docker tag mrva-hepc-container:0.4.0 \ + ghcr.io/hohn/mrva-hepc-container:0.4.0 + # Run standalone docker run -p 8070:8070 -ti mrva-hepc-container:0.4.0 diff --git a/containers/server/Dockerfile b/containers/server/Dockerfile index 5745578..eccda77 100644 --- a/containers/server/Dockerfile +++ b/containers/server/Dockerfile @@ -18,7 +18,7 @@ RUN go mod tidy && go build -o /app/mrvaserver-binary # RUN go mod download # Create a runtime container -FROM ubuntu:24.10 as runner +FROM ubuntu:24.10 AS runner ENV DEBIAN_FRONTEND=noninteractive # Build argument for CodeQL version, defaulting to the latest release diff --git a/containers/server/README.org b/containers/server/README.org index e146ca5..b03cd9d 100644 --- a/containers/server/README.org +++ b/containers/server/README.org @@ -25,7 +25,10 @@ - Tag the container. This is sufficient for further use on the local machine. #+BEGIN_SRC sh - docker tag mrva-server:0.4.0 ghcr.io/hohn/mrva-server:0.4.0 + # tag it + cd ~/work-gh/mrva/mrva-docker/containers/server &&\ + docker tag mrva-server:0.4.0 \ + ghcr.io/hohn/mrva-server:0.4.0 #+END_SRC - Push this container diff --git a/containers/vscode/Dockerfile b/containers/vscode/Dockerfile index 1839a3b..6bc29bf 100644 --- a/containers/vscode/Dockerfile +++ b/containers/vscode/Dockerfile @@ -51,7 +51,7 @@ RUN mkdir -p /home/coder/.local/ && \ USER coder # Set environment variables -ENV PASSWORD mrva +ENV PASSWORD=mrva # Copy all potential vscode-codeql builds COPY ./artifacts/vscode-codeql-1.13.2-* /home/coder/ diff --git a/containers/vscode/README.org b/containers/vscode/README.org index 687a13b..7cc37f4 100644 --- a/containers/vscode/README.org +++ b/containers/vscode/README.org @@ -5,12 +5,17 @@ #+BEGIN_SRC sh # Build the container via cd ~/work-gh/mrva/mrva-docker/containers/vscode/ - docker build --no-cache -t code-server-initialized:0.1.24 . + docker build --no-cache -t code-server-initialized:0.4.0 . # Run the container in standalone mode via cd ~/work-gh/mrva/mrva-docker/containers/vscode/ docker run -v ~/work-gh/mrva/vscode-codeql:/work-gh/mrva/vscode-codeql \ - -d -p 9080:9080 code-server-initialized:0.1.24 + -d -p 9080:9080 code-server-initialized:0.4.0 + + # Tag it + cd ~/work-gh/mrva/mrva-docker/containers/vscode/ + docker tag code-server-initialized:0.4.0 \ + ghcr.io/hohn/code-server-initialized:0.4.0 #+END_SRC - build vscode-codeql plugin @@ -249,24 +254,24 @@ #+BEGIN_SRC sh docker ps # Check id column. Use it below. - docker commit 2f3df413ae3b code-server-initialized:0.1.24 + docker commit 2f3df413ae3b code-server-initialized:0.4.0 # Keep the sha # sha256:1b382a721d8f3892ed22861701f19d3ed4b42a2db8d6d96b6f89fcb6e9c4161e docker kill 2f3df413ae3b # Make sure the image tag matches the sha - docker inspect code-server-initialized:0.1.24 |grep Id + docker inspect code-server-initialized:0.4.0 |grep Id # Run the image and check content docker run --rm -d -p 9080:9080 --name test-code-server-codeql \ - code-server-initialized:0.1.24 + code-server-initialized:0.4.0 #+END_SRC Again connect to it at http://localhost:9080/?folder=/home/coder, password is =mrva=. - [ ] Push this container #+BEGIN_SRC sh # Common - export CSI_TARGET=code-server-initialized:0.1.24 + export CSI_TARGET=code-server-initialized:0.4.0 # Push container docker tag ${CSI_TARGET} ghcr.io/hohn/${CSI_TARGET}