fun with docker

Author: ryrobes

.github/workflows/docker-publish.yml

@@ -57,3 +57,4 @@ backend/defs/secrets.edn
 !backend/extras/rabbit-kit-outliers/rabbit-kit-outliers.jar
 /rvbbit-*
 .zprint*
+docker-staging/

.gitignore

@@ -14,27 +14,30 @@ RUN apt-get update && apt-get install -y \
     && rm -rf /var/lib/apt/lists/*
 
 WORKDIR /app
-COPY backend/rvbbit.jar .
-COPY backend/defs ./defs
-COPY backend/connections ./connections
-COPY backend/assets ./assets
-COPY backend/resources ./resources
-COPY backend/data ./data
-RUN mkdir ./db
-COPY backend/flows ./flows
-COPY backend/extras ./extras
-COPY backend/screens ./screens
-COPY backend/user.clj ./user.clj
 
-RUN  rm -rf ./assets/data-exports \
-    && rm -rf ./data/atoms \
-    && rm -rf ./defs/backup \
-    && rm -rf ./extras/node-colorthief/node_modules \
-    && rm -f ./extras/node-colorthief/package-lock.json  
+#COPY docker-staging/* .
+# Copy all necessary files and delete unnecessary ones in a single RUN command
+COPY docker-staging/rvbbit.jar .
+COPY docker-staging/defs ./defs
+COPY docker-staging/connections ./connections
+COPY docker-staging/assets ./assets
+COPY docker-staging/resources ./resources
+COPY docker-staging/data ./data
+COPY docker-staging/flows ./flows
+COPY docker-staging/extras ./extras
+COPY docker-staging/screens ./screens
+COPY docker-staging/user.clj ./user.clj
 
-RUN mkdir ./data/atoms
-RUN mkdir ./assets/data-exports
-RUN mkdir ./shell-root
+RUN mkdir ./db \
+    # && rm -rf ./assets/data-exports \
+    # && rm -f ./defs/secrets.edn \
+    # && rm -rf ./data/atoms \
+    # && rm -rf ./defs/backup \
+    # && rm -rf ./extras/node-colorthief/node_modules \
+    # && rm -f ./extras/node-colorthief/package-lock.json \
+    # && mkdir ./data/atoms \
+    # && mkdir ./assets/data-exports \
+    && mkdir ./shell-root
 
 # # Specify the command to run your application
 # CMD ["java", "-jar", "rvbbit.jar"]

Dockerfile

@@ -9,7 +9,6 @@ fi
 
 # If we're here, we're safe-ish.
 
-# clear
 export LEIN_SNAPSHOTS_IN_RELEASE=true ## for now, until we have a better build process. besides, most of the snapshot deps are mine.
 
 draw_bordered_text() {
@@ -68,15 +67,29 @@ cp -r screens "../$DIR_NAME/screens"
 cp user.clj "../$DIR_NAME/"
 cp run-rabbit.sh "../$DIR_NAME/"
 cp rvbbit.jar "../$DIR_NAME/"
+
+## my dev repo has lots of things in gitignore - but still present locally. wont apply to fresh clones.
+rm -rf ../docker-staging
 rm -rf "../$DIR_NAME/assets/data-exports"
 rm -rf "../$DIR_NAME/data/atoms"
 rm -rf "../$DIR_NAME/defs/backup"
+rm -f "../$DIR_NAME/defs/secrets.edn"
 rm -rf "../$DIR_NAME/extras/node-colorthief/node_modules"
 rm "../$DIR_NAME/extras/node-colorthief/package-lock.json"
+mkdir -p "../$DIR_NAME/data/atoms"
+mkdir -p "../$DIR_NAME/assets/data-exports"
+
+## due to docker "layering" I cannot remove files once added to a layer, so I have to pre-remove them here first
+## also only applies to local dev repo, not fresh clones.
+mkdir -p ../docker-staging
 
 rm -rf "../$DIR_NAME.zip"
 zip -rq "../$DIR_NAME.zip" "../$DIR_NAME/"
 
+cd "../$DIR_NAME"
+cp -r * ../docker-staging/
+cd ../backend
+
 echo ""
 cat data/nname.ans
 echo ""
@@ -85,6 +98,6 @@ echo ""
 
 # draw_bordered_text "building Docker image..."
 # cd ..
-# docker build -t rvbbit .
+# docker build --no-cache -t rvbbit .
 # docker run -d -p 8888:8888 -p 3030:3030 -p 8181:8181 -v rvbbit-root:/app/ rvbbit