Keep dev dockerfile up to date with main

.github/workflows/docker.yml

@@ -11,10 +11,10 @@ on:
       tag:
         description: 'Image tag'
         required: true
-        default: 'devel'
+        default: 'dev'
         type: choice
         options:
-          - devel
+          - dev
           - latest
 
 jobs:
@@ -35,19 +35,22 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Build and push Apollo CLI image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           platforms: linux/arm64/v8,linux/amd64
           push: true
           tags: ghcr.io/gmod/apollo-cli:${{ inputs.tag }}
           context: packages/apollo-cli
+          file:
+            ${{ inputs.tag == 'dev' && 'packages/apollo-cli/dev.Dockerfile' ||
+            'packages/apollo-cli/Dockerfile' }}
           outputs:
             type=image,annotation-index.org.opencontainers.image.description=
             Apollo CLI
           cache-from: type=registry,ref=user/app:latest
           cache-to: type=inline
       - name: Build and push Apollo collaboration server image
-        uses: docker/build-push-action@v5
+        uses: docker/build-push-action@v6
         with:
           platforms: linux/arm64/v8,linux/amd64
           push: true

.github/workflows/push.yml

@@ -51,7 +51,7 @@ jobs:
     if: ${{ github.ref == 'refs/heads/main' }}
     uses: ./.github/workflows/docker.yml
     with:
-      tag: devel
+      tag: dev
     secrets: inherit
   deploy:
     needs: [docker]

packages/apollo-cli/dev.Dockerfile

@@ -0,0 +1,32 @@
+# syntax=docker/dockerfile:1
+
+FROM node:20-alpine AS setup
+WORKDIR /app
+COPY package.json yarn.lock .yarnrc.yml ./
+COPY .yarn/ .yarn/
+COPY packages/ packages/
+RUN find packages/ -type f \! \( -name "package.json" -o -name "yarn.lock" \) -delete && \
+find . -type d -empty -delete
+
+FROM node:20-alpine AS build
+WORKDIR /app
+COPY --from=setup /app .
+RUN yarn install --immutable
+COPY . .
+WORKDIR /app/packages/apollo-shared
+RUN yarn build
+WORKDIR /app/packages/apollo-cli
+RUN yarn build
+
+FROM node:20-alpine
+LABEL org.opencontainers.image.source=https://github.com/GMOD/Apollo3
+LABEL org.opencontainers.image.description="Apollo CLI"
+WORKDIR /app
+COPY package.json yarn.lock .yarnrc.yml ./
+COPY .yarn/ .yarn/
+COPY packages/apollo-cli packages/apollo-cli
+COPY --from=build /app/packages/apollo-cli/dist ./packages/apollo-cli/dist
+RUN yarn workspaces focus --production @apollo-annotation/cli
+WORKDIR /app/packages/apollo-cli
+ENV APOLLO_DISABLE_CONFIG_CREATE=1
+ENTRYPOINT ["yarn", "node", "bin/run.js"]