fix docker build

This commit is contained in:
Christian Kellner
2025-05-15 10:16:43 +02:00
parent 4bab3bd9da
commit 9a09548a07
2 changed files with 48 additions and 21 deletions

View File

@@ -1,4 +1,5 @@
name: Create and publish Docker image name: Create and publish Docker image
on: on:
push: push:
branches: branches:
@@ -24,7 +25,7 @@ jobs:
- name: Set up QEMU - name: Set up QEMU
uses: docker/setup-qemu-action@v2 uses: docker/setup-qemu-action@v2
with: with:
platforms: linux/amd64, linux/arm64 platforms: linux/amd64,linux/arm64
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2 uses: docker/setup-buildx-action@v2
@@ -42,11 +43,29 @@ jobs:
with: with:
images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }} images: ${{ env.REGISTRY }}/${{ env.IMAGE_NAME }}
- name: Build and push Docker image - name: Build and push Docker image with cache & retry
uses: docker/build-push-action@v3 run: |
with: set -e
context: . for i in {1..3}; do
push: true echo "Attempt $i of 3"
platforms: linux/amd64,linux/arm64 docker buildx build \
tags: ${{ steps.meta.outputs.tags }} --push \
labels: ${{ steps.meta.outputs.labels }} --platform linux/amd64,linux/arm64 \
--tag ${{ steps.meta.outputs.tags }} \
--label ${{ steps.meta.outputs.labels }} \
--cache-from=type=gha \
--cache-to=type=gha,mode=max \
.
status=$?
if [ $status -eq 0 ]; then
echo "Docker build succeeded on attempt $i"
break
else
echo "Docker build failed (attempt $i). Retrying in 10 seconds..."
sleep 10
fi
if [ $i -eq 3 ]; then
echo "Docker build failed after 3 attempts. Exiting with error."
exit 1
fi
done

View File

@@ -1,25 +1,33 @@
FROM node:20 FROM node:20
WORKDIR /fredy # Install chromium dependencies in a separate layer (cacheable)
RUN apt-get update && apt-get install -y chromium && \
apt-get clean && rm -rf /var/lib/apt/lists/*
COPY . /fredy # Set working directory
WORKDIR /fredy
RUN apt-get update && apt-get install -y chromium # Copy only package.json + yarn.lock for dependency caching
COPY package.json yarn.lock ./
ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true \ # Increase network timeout for npm registry
PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium RUN yarn config set network-timeout 600000 && yarn install
RUN yarn install
# Global tools (cached separately)
RUN yarn global add pm2 RUN yarn global add pm2
# Copy application source code (after deps, cache friendly)
COPY . .
# Build step (assuming 'prod' is a build script)
RUN yarn run prod RUN yarn run prod
# Prepare runtime dirs
RUN mkdir /db /conf && \ RUN mkdir /db /conf && \
chown 1000:1000 /db /conf && \ chown 1000:1000 /db /conf && \
chmod 777 -R /db/ && \ chmod 777 -R /db/ && \
ln -s /db /fredy/db && ln -s /conf /fredy/conf ln -s /db /fredy/db && ln -s /conf /fredy/conf
# Expose port & set runtime command
EXPOSE 9998 EXPOSE 9998
CMD ["pm2-runtime", "index.js"]
CMD pm2-runtime index.js