try new docker app layout

Signed-off-by: Marc Dumais <[email protected]>

Author: marcdumais-work

.github/workflows/docker-example.yml

@@ -18,10 +18,10 @@ jobs:
         os: [ubuntu-latest]
         node-version: [18]
         params:
-          - name: "theia-ext"
-            folder: "theia-app-theia-ext"
-          - name: "vscode-ext"
-            folder: "theia-app-vscode-ext"
+          - name: "tate"
+            resources-folder: "theia-app-theia-ext"
+          - name: "tave"
+            resources-folder: "theia-app-vscode-ext"
 
     steps:
     - uses: actions/checkout@v4
@@ -40,7 +40,7 @@ jobs:
         retry_on: error
         command: |
           cd docker
-          docker build . --build-arg APP_SUBFOLDER=${{ matrix.params.folder }} -t tte-${{ matrix.params.name }} -f ${{ matrix.params.folder }}/Dockerfile 
+          docker build . --build-arg RESOURCES=${{ matrix.params.resources-folder }} -t tte-${{ matrix.params.name }} -f Dockerfile-${{ matrix.params.name }} 
         on_retry_command: cd ../..
 
     - name: Run docker image
@@ -51,5 +51,5 @@ jobs:
       run: |
         yarn --ignore-scripts
         cd docker
-        yarn --cwd ${{ matrix.params.folder }} test
+        yarn --cwd ${{ matrix.params.resources-folder }} test
 

docker/theia-app-theia-ext/Dockerfile docker/Dockerfile-tatedocker/theia-app-theia-ext/Dockerfile renamed to docker/Dockerfile-tate

@@ -1,5 +1,5 @@
 FROM node:18.20.4-bookworm-slim AS build
-ARG APP_SUBFOLDER
+ARG RESOURCES
 
 RUN apt-get update && apt-get install -y \
     git \
@@ -12,8 +12,8 @@ RUN apt-get update && apt-get install -y \
     libxkbfile-dev
 
 # Build the browser theia-trace-extension application
-COPY ${APP_SUBFOLDER}/package.json /app/tte/
-COPY ${APP_SUBFOLDER}/webpack.config.js /app/tte/
+COPY ${RESOURCES}/package.json /app/tte/
+COPY ${RESOURCES}/webpack.config.js /app/tte/
 COPY yarn.lock  /app/tte/
 WORKDIR /app/tte/
 RUN yarn && \
@@ -27,7 +27,7 @@ RUN yarn && \
     du -hs /app/tte
 
 FROM node:18.19.1-bookworm-slim
-ARG APP_SUBFOLDER
+ARG RESOURCES
 
 COPY --from=build /app/tte /app/tte
 
@@ -39,6 +39,6 @@ RUN apt-get update && apt-get install -y \
 ENV NODE_ENV=production
 
 WORKDIR /app/tte
-COPY ${APP_SUBFOLDER}/docker-entrypoint.sh /usr/local/bin
+COPY ${RESOURCES}/docker-entrypoint.sh /usr/local/bin
 EXPOSE 4000
 ENTRYPOINT ["docker-entrypoint.sh"]

docker/theia-app-vscode-ext/Dockerfile docker/Dockerfile-tavedocker/theia-app-vscode-ext/Dockerfile renamed to docker/Dockerfile-tave

@@ -1,5 +1,5 @@
 FROM node:18.20.4-bookworm-slim AS build
-ARG APP_SUBFOLDER
+ARG RESOURCES
 
 RUN apt-get update && apt-get install -y \
     git \
@@ -12,8 +12,8 @@ RUN apt-get update && apt-get install -y \
     libxkbfile-dev
 
 # Build the browser trace-extension application
-COPY ${APP_SUBFOLDER}/package.json /app/tte/
-COPY ${APP_SUBFOLDER}/webpack.config.js /app/tte/
+COPY ${RESOURCES}/package.json /app/tte/
+COPY ${RESOURCES}/webpack.config.js /app/tte/
 COPY yarn.lock  /app/tte/
 WORKDIR /app/tte/
 RUN yarn && \
@@ -29,7 +29,7 @@ RUN yarn && \
     du -hs /app/tte
 
 FROM node:18.19.1-bookworm-slim
-ARG APP_SUBFOLDER
+ARG RESOURCES
 
 COPY --from=build /app/tte /app/tte
 
@@ -41,6 +41,6 @@ RUN apt-get update && apt-get install -y \
 ENV NODE_ENV=production
 
 WORKDIR /app/tte
-COPY ${APP_SUBFOLDER}/docker-entrypoint.sh /usr/local/bin
+COPY ${RESOURCES}/docker-entrypoint.sh /usr/local/bin
 EXPOSE 4000
 ENTRYPOINT ["docker-entrypoint.sh"]

docker/package.json

@@ -8,14 +8,14 @@
   "devDependencies": {
   },
   "scripts": {
-    "prepare": "yarn vscodeExt",
-    "build": "yarn theiaExt build && yarn vscodeExt build",
-    "build:prod": "yarn theiaExt build:prod && yarn vscodeExt build:prod",
-    "theiaExt": "yarn --cwd theia-app-theia-ext",
-    "vscodeExt": "yarn --cwd theia-app-vscode-ext",
+    "prepare": "yarn tave",
+    "build": "yarn tate build && yarn tave build",
+    "build:prod": "yarn tate build:prod && yarn tave build:prod",
+    "tate": "yarn --cwd theia-app-theia-ext",
+    "tave": "yarn --cwd theia-app-vscode-ext",
     "build:docker": "yarn build:docker:tate && yarn build:docker:tave",
-    "build:docker:tate": "docker build --no-cache --network=host . --build-arg APP_SUBFOLDER=theia-app-theia-ext -t tte-theia-app-theia-ext -f theia-app-theia-ext/Dockerfile",
-    "build:docker:tave": "docker build --no-cache --network=host . --build-arg APP_SUBFOLDER=theia-app-vscode-ext -t tte-theia-app-vscode-ext -f theia-app-vscode-ext/Dockerfile"
+    "build:docker:tate": "docker build  --no-cache --network=host . --build-arg RESOURCES=theia-app-theia-ext -t tte-tate -f Dockerfile-tate",
+    "build:docker:tave": "docker build  --no-cache --network=host . --build-arg RESOURCES=theia-app-vscode-ext -t tte-tave -f Dockerfile-tave"
   },
   "engines": {
   },

docker/theia-app-theia-ext/README.md

@@ -16,7 +16,7 @@ Build the image and name it _tate_ (short for "theia application - theia extensi
 Try adding `--network host` in case of build failures related to debian packages retrieval:
 
 ```bash
-docker build -t tate .
+docker build -f Dockerfile-tate -t tate .
 ```
 
 Once the image has been built, start a container named _tate-1_ from