From dabcb04d7a7551d57cb2761a21ae57aa366f7193 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 15 Dec 2023 10:25:32 +0100 Subject: [PATCH] use gitea actions --- .gitea/workflows/container.yaml | 12 ++++++++++++ .woodpecker.yml | 11 ----------- Dockerfile => Containerfile | 8 +++++--- 3 files changed, 17 insertions(+), 14 deletions(-) create mode 100644 .gitea/workflows/container.yaml delete mode 100644 .woodpecker.yml rename Dockerfile => Containerfile (93%) diff --git a/.gitea/workflows/container.yaml b/.gitea/workflows/container.yaml new file mode 100644 index 0000000..e48b3fd --- /dev/null +++ b/.gitea/workflows/container.yaml @@ -0,0 +1,12 @@ +name: Build Multiarch Container Image +on: [push] +jobs: + call-reusable-workflow: + uses: container/multiarch-build-workflow/.gitea/workflows/build.yaml@main + with: + repository: ${{ gitea.repository }} + ref_name: ${{ gitea.ref_name }} + sha: ${{ gitea.sha }} + registry_url: ${{ secrets.REGISTRY_URL }} + registry_user: ${{ secrets.REGISTRY_USER }} + registry_pw: ${{ secrets.REGISTRY_PW }} diff --git a/.woodpecker.yml b/.woodpecker.yml deleted file mode 100644 index 8413913..0000000 --- a/.woodpecker.yml +++ /dev/null @@ -1,11 +0,0 @@ -pipeline: - publish-docker-image: - image: plugins/kaniko - settings: - repo: docker.io/thallian/wikijs - tags: latest,${CI_COMMIT_SHA:0:8},${CI_COMMIT_TAG=pre} - dockerfile: Dockerfile - username: - from_secret: DOCKER_USER - password: - from_secret: DOCKER_PW \ No newline at end of file diff --git a/Dockerfile b/Containerfile similarity index 93% rename from Dockerfile rename to Containerfile index e293e6b..1d48018 100644 --- a/Dockerfile +++ b/Containerfile @@ -1,4 +1,4 @@ -FROM docker.io/alpine:3.18 as builder +FROM docker.io/alpine:3.19 as builder RUN apk add --no-cache \ git \ @@ -6,7 +6,9 @@ RUN apk add --no-cache \ bash \ python3 \ make \ - sed + sed \ + g++ \ + musl-dev #ENV NODE_ENV=production @@ -30,7 +32,7 @@ RUN npm install --legacy-peer-deps --save-dev webpack webpack-cli RUN npx webpack --profile --config dev/webpack/webpack.prod.js RUN sed -i '0,/.*"dev".*/s//"dev": false,/' package.json -FROM docker.io/thallian/confd-env:3.18-3.1.5.0 +FROM docker.io/thallian/confd-env:3.19-3.1.6.2 ENV NODE_ENV=production