concluding tag management: restored dockerfile
Signed-off-by: Stephan Richter <s.richter@srsoftware.de>
This commit is contained in:
@@ -15,7 +15,7 @@ jobs:
|
||||
uses: actions/checkout@v4
|
||||
|
||||
- name: Build docker image
|
||||
run: docker build --no-cache -t umbrella .
|
||||
run: docker build -t umbrella .
|
||||
|
||||
- name: Store tag date
|
||||
run: |
|
||||
@@ -52,7 +52,6 @@ jobs:
|
||||
if [ $COUNT -gt 10 ]; then
|
||||
REMAIN=$((COUNT - 10))
|
||||
echo "$TAGS" | head -n $REMAIN > /tmp/old_tags
|
||||
echo "latest" >> /tmp/old_tags
|
||||
else
|
||||
echo less than 10 tags, skipping cleanup
|
||||
echo "" > /tmp/old_tags
|
||||
|
||||
53
Dockerfile
53
Dockerfile
@@ -1,36 +1,29 @@
|
||||
FROM alpine:3.22 AS svelte_build
|
||||
RUN apk add bash git npm
|
||||
#RUN adduser -Dh /home/svelte svelte
|
||||
#ADD . /home/svelte/Umbrella
|
||||
#RUN chown -R svelte /home/svelte/Umbrella
|
||||
#USER svelte
|
||||
#WORKDIR /home/svelte/Umbrella/frontend
|
||||
#RUN npm install && npm run build
|
||||
RUN date +%s > /timestamp
|
||||
RUN cat /timestamp
|
||||
RUN adduser -Dh /home/svelte svelte
|
||||
ADD . /home/svelte/Umbrella
|
||||
RUN chown -R svelte /home/svelte/Umbrella
|
||||
USER svelte
|
||||
WORKDIR /home/svelte/Umbrella/frontend
|
||||
RUN npm install && npm run build
|
||||
|
||||
|
||||
|
||||
#FROM alpine AS java_build
|
||||
#RUN apk add bash git gradle fontconfig font-opensans openjdk21-jre
|
||||
#ADD . /Umbrella
|
||||
#WORKDIR /Umbrella
|
||||
#COPY --from=svelte_build /home/svelte/Umbrella/frontend/dist web/src/main/resources/web
|
||||
#RUN gradle --no-daemon build
|
||||
FROM alpine AS java_build
|
||||
RUN apk add bash git gradle fontconfig font-opensans openjdk21-jre
|
||||
ADD . /Umbrella
|
||||
WORKDIR /Umbrella
|
||||
COPY --from=svelte_build /home/svelte/Umbrella/frontend/dist web/src/main/resources/web
|
||||
RUN gradle --no-daemon build
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
#FROM alpine
|
||||
#RUN apk add bash fontconfig font-opensans graphviz openjdk21-jre weasyprint
|
||||
#RUN adduser -D umbrella
|
||||
#COPY --from=java_build /Umbrella/backend/build/libs/backend.jar /home/umbrella/jar/
|
||||
#RUN chown -R umbrella /home/umbrella
|
||||
#ADD https://github.com/plantuml/plantuml/releases/download/v1.2025.10/plantuml-1.2025.10.jar /home/umbrella/plantuml.jar
|
||||
#USER umbrella
|
||||
#WORKDIR /home/umbrella
|
||||
#RUN mkdir .config && ln -s /host/config.json .config/Umbrella.json
|
||||
#EXPOSE 80
|
||||
#CMD java -jar jar/backend.jar
|
||||
|
||||
FROM alpine
|
||||
RUN apk add bash fontconfig font-opensans graphviz openjdk21-jre weasyprint
|
||||
RUN adduser -D umbrella
|
||||
COPY --from=java_build /Umbrella/backend/build/libs/backend.jar /home/umbrella/jar/
|
||||
RUN chown -R umbrella /home/umbrella
|
||||
ADD https://github.com/plantuml/plantuml/releases/download/v1.2025.10/plantuml-1.2025.10.jar /home/umbrella/plantuml.jar
|
||||
USER umbrella
|
||||
WORKDIR /home/umbrella
|
||||
RUN mkdir .config && ln -s /host/config.json .config/Umbrella.json
|
||||
EXPOSE 80
|
||||
CMD java -jar jar/backend.jar
|
||||
|
||||
Reference in New Issue
Block a user