Merge branch 'main' into renovate/docker-build-push-action-6.x
Build image / build (pull_request) Failing after 9m14s Details

This commit is contained in:
bizcochito 2024-12-01 12:46:58 +00:00
commit 57ec214d84
7 changed files with 3030 additions and 2511 deletions

View File

@ -21,23 +21,23 @@ jobs:
- name: Installing necessary packages - name: Installing necessary packages
run: apk add nodejs git curl bash run: apk add nodejs git curl bash
- name: Checkout - name: Checkout
uses: actions/checkout@v3 uses: actions/checkout@v4
- name: Docker meta - name: Docker meta
id: meta id: meta
uses: https://github.com/docker/metadata-action@v4 uses: https://github.com/docker/metadata-action@v5
with: with:
# list of Docker images to use as base name for tags # list of Docker images to use as base name for tags
images: | images: |
git.fai.st/fedi-image-bot/moderation-fe git.fai.st/fedi-image-bot/moderation-fe
# generate Docker tags based on the following events/attributes # generate Docker tags based on the following events/attributes
tags: | tags: |
type=raw,value=latest,enable=${{ github.ref == format('refs/heads/{0}', 'main') }} type=raw,value=latest
type=ref,event=branch type=ref,event=branch
type=semver,pattern={{raw}} type=semver,pattern={{raw}}
- name: Set up Docker Buildx - name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2 uses: docker/setup-buildx-action@v2
- name: Login to fai.st docker registry - name: Login to fai.st docker registry
uses: docker/login-action@v2 uses: docker/login-action@v3
with: with:
registry: git.fai.st registry: git.fai.st
username: ${{ secrets.DOCKER_USER }} username: ${{ secrets.DOCKER_USER }}

View File

@ -1,9 +1,9 @@
FROM oven/bun:1 AS install FROM node:23-alpine AS install
RUN mkdir -p /temp/prod RUN mkdir -p /temp/prod
COPY package.json bun.lockb /temp/prod/ COPY package*.json /temp/prod/
RUN cd /temp/prod && bun install --frozen-lockfile RUN cd /temp/prod && npm install --frozen-lockfile
COPY . /temp/prod/ COPY . /temp/prod/
RUN cd /temp/prod && bun run build RUN cd /temp/prod && npm run build
FROM nginx AS release FROM nginx AS release
COPY --from=install /temp/prod/dist /usr/share/nginx/html COPY --from=install /temp/prod/dist /usr/share/nginx/html

BIN
bun.lockb

Binary file not shown.

View File

@ -1,7 +0,0 @@
[test]
preload = './happydom.ts'
[install.lockfile]
# whether to save a non-Bun lockfile alongside bun.lockb
# only "yarn" is supported
print = "yarn"

3021
package-lock.json generated Normal file

File diff suppressed because it is too large Load Diff

View File

@ -5,7 +5,7 @@
"type": "module", "type": "module",
"scripts": { "scripts": {
"dev": "docker compose down -v && docker compose watch", "dev": "docker compose down -v && docker compose watch",
"build": "bunx --bun tsc && bunx --bun vite build", "build": "tsc && vite build",
"lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0" "lint": "eslint . --ext ts,tsx --report-unused-disable-directives --max-warnings 0"
}, },
"dependencies": { "dependencies": {

2495
yarn.lock

File diff suppressed because it is too large Load Diff