updated dockerfiles and READMEs to v0.4.0

This commit is contained in:
2025-06-30 16:02:39 -07:00
parent 4d8cd5b53f
commit e74f135494
8 changed files with 27 additions and 12 deletions

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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

View File

@@ -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/

View File

@@ -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}