Skip to content

Commit

Permalink
Refactor Dockerfile to update base image version and fix file ownersh…
Browse files Browse the repository at this point in the history
…ip and permissions
  • Loading branch information
cbluebird committed Oct 11, 2024
1 parent 1241069 commit 93bbb5b
Show file tree
Hide file tree
Showing 7 changed files with 67 additions and 27 deletions.
18 changes: 9 additions & 9 deletions Framework/rocket/0.5.1/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
FROM ghcr.io/labring-actions/devbox/rust-1.81.0:ae313b
FROM ghcr.io/labring-actions/devbox/rust-1.81.0:255ae9

RUN cd /home/sealos/project && \
RUN cd /home/devbox/project && \
rm -rf ./*

USER root
COPY /Framework/rocket/0.5.1/project /home/sealos/project
COPY /Framework/rocket/0.5.1/project /home/devbox/project

RUN chown -R sealos:sealos /home/sealos/project && \
chmod -R u+rw /home/sealos/project && \
chmod -R +x /home/sealos/project/entrypoint.sh
RUN chown -R devbox:devbox /home/devbox/project && \
chmod -R u+rw /home/devbox/project && \
chmod -R +x /home/devbox/project/entrypoint.sh

USER sealos
RUN cd /home/sealos/project && \
USER devbox
RUN cd /home/devbox/project && \
cargo build --release

RUN mkdir -p /home/sealos/.sealos
RUN mkdir -p /home/devbox/.devbox
9 changes: 9 additions & 0 deletions Framework/rocket/0.5.1/project/.vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
{
"recommendations": [
"pomdtr.excalidraw-editor",
"editorconfig.editorconfig",
"lokalise.i18n-ally",
"rust-lang.rust-analyzer",
"dustypomerleau.rust-syntax"
]
}
10 changes: 10 additions & 0 deletions Framework/rocket/update_cn_dockerfile.sh
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
#!/bin/bash

DOCKERFILE=$1
echo "DOCKERFILE: $DOCKERFILE"
TMP_DOCKERFILE="${DOCKERFILE}tmp"
cp $DOCKERFILE $TMP_DOCKERFILE

# 修正sed命令
sed -i '$i\
COPY /OS/debian-ssh/debian.sources /etc/apt/sources.list.d/debian.sources' "$TMP_DOCKERFILE"
18 changes: 9 additions & 9 deletions Framework/spring-boot/3.3.2/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
FROM ghcr.io/labring-actions/devbox/java-openjdk17:006879
FROM ghcr.io/labring-actions/devbox/java-openjdk17:255ae9

RUN cd /home/sealos/project && \
RUN cd /home/devbox/project && \
rm -rf ./*

COPY /Framework/spring-boot/3.3.2/project /home/sealos/project
COPY /Framework/spring-boot/3.3.2/project /home/devbox/project

RUN chown -R sealos:sealos /home/sealos/project && \
chmod -R u+rw /home/sealos/project && \
chmod -R +x /home/sealos/project/entrypoint.sh
RUN chown -R devbox:devbox /home/devbox/project && \
chmod -R u+rw /home/devbox/project && \
chmod -R +x /home/devbox/project/entrypoint.sh

USER sealos
RUN cd /home/sealos/project && \
USER devbox
RUN cd /home/devbox/project && \
mvn install

RUN mkdir /home/sealos/.sealos
RUN mkdir /home/devbox/.devbox
11 changes: 11 additions & 0 deletions Framework/spring-boot/3.3.2/project/.vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"recommendations": [
"pomdtr.excalidraw-editor",
"editorconfig.editorconfig",
"lokalise.i18n-ally",
"formulahendry.code-runner",
"oracle.oracle-java",
"vscjava.vscode-java-pack",
"vscjava.vscode-spring-initializr"
]
}
18 changes: 9 additions & 9 deletions Framework/vert.x/4.5.10/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,17 +1,17 @@
FROM ghcr.io/labring-actions/devbox/java-openjdk17:006879
FROM ghcr.io/labring-actions/devbox/java-openjdk17:255ae9

RUN cd /home/sealos/project && \
RUN cd /home/devbox/project && \
rm -rf ./*

COPY /Framework/vert.x/4.5.10/project /home/sealos/project
COPY /Framework/vert.x/4.5.10/project /home/devbox/project

RUN chown -R sealos:sealos /home/sealos/project && \
chmod -R u+rw /home/sealos/project && \
chmod -R +x /home/sealos/project/entrypoint.sh
RUN chown -R devbox:devbox /home/devbox/project && \
chmod -R u+rw /home/devbox/project && \
chmod -R +x /home/devbox/project/entrypoint.sh

USER sealos
RUN cd /home/sealos/project && \
USER devbox
RUN cd /home/devbox/project && \
mvn package && \
mvn install

RUN mkdir /home/sealos/.sealos
RUN mkdir /home/devbox/.devbox
10 changes: 10 additions & 0 deletions Framework/vert.x/4.5.10/project/.vscode/extensions.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
"recommendations": [
"pomdtr.excalidraw-editor",
"editorconfig.editorconfig",
"lokalise.i18n-ally",
"formulahendry.code-runner",
"oracle.oracle-java",
"vscjava.vscode-java-pack"
]
}

0 comments on commit 93bbb5b

Please sign in to comment.