From e5acdd43c968ca58f42993dddc38dd030f49923b Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Sat, 2 Jul 2022 19:11:43 +0200 Subject: [PATCH 01/10] push to version 2.5.285 --- Dockerfile | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 080e8ac..6d53a97 100644 --- a/Dockerfile +++ b/Dockerfile @@ -5,7 +5,8 @@ RUN apk add --no-cache \ npm \ bash \ python3 \ - make + make \ + sed #ENV NODE_ENV=production @@ -17,7 +18,7 @@ RUN npm install -g \ webpack-cli \ node-gyp -ENV WIKIJS_VERSION=v2.5.275 +ENV WIKIJS_VERSION=v2.5.285 RUN git clone https://github.com/Requarks/wiki.git -b $WIKIJS_VERSION /build @@ -26,6 +27,7 @@ RUN npm install --legacy-peer-deps # don't know why this is needed here too, but what the hell RUN npm install --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 thallian/confd-env:latest From 9fe5b0bcd58987d2090f44a993da73ad347d6bd3 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 12 Jul 2022 20:39:51 +0200 Subject: [PATCH 02/10] update base image --- Dockerfile | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6d53a97..d0f5c7d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM alpine:3.15 as builder +FROM docker.io/alpine:3.16 as builder RUN apk add --no-cache \ git \ @@ -25,11 +25,11 @@ RUN git clone https://github.com/Requarks/wiki.git -b $WIKIJS_VERSION /build WORKDIR /build RUN npm install --legacy-peer-deps # don't know why this is needed here too, but what the hell -RUN npm install --save-dev webpack webpack-cli +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 thallian/confd-env:latest +FROM docker.io/thallian/confd-env:3.16 ENV NODE_ENV=production From b2a27202d0fa4fcbc0771dfdd52efdd1c44e6eaa Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 11 Nov 2022 07:19:23 +0000 Subject: [PATCH 03/10] Delete '.gitlab-ci.yml' --- .gitlab-ci.yml | 18 ------------------ 1 file changed, 18 deletions(-) delete mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 3148d08..0000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,18 +0,0 @@ -variables: - CONTAINER_NAME: thallian/wikijs - -build: - stage: build - image: - name: gcr.io/kaniko-project/executor:debug - entrypoint: [""] - script: - - mkdir -p /kaniko/.docker - - echo "{\"auths\":{\"$CI_REGISTRY\":{\"auth\":\"$(printf "%s:%s" "$CI_REGISTRY_USER" "$CI_REGISTRY_PASSWORD" | base64 | tr -d '\n')\"}}}" > /kaniko/.docker/config.json - - >- - /kaniko/executor - --context "$CI_PROJECT_DIR" - --dockerfile "$CI_PROJECT_DIR/Dockerfile" - --destination "$CONTAINER_NAME:$CI_COMMIT_SHA" - --destination "$CONTAINER_NAME:$CI_COMMIT_REF_NAME" - --destination "$CONTAINER_NAME:latest" From 12dc2754f7c4541c5d59748522e938f0cd3a7380 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 11 Nov 2022 07:20:12 +0000 Subject: [PATCH 04/10] Add '.woodpecker.yml' --- .woodpecker.yml | 11 +++++++++++ 1 file changed, 11 insertions(+) create mode 100644 .woodpecker.yml diff --git a/.woodpecker.yml b/.woodpecker.yml new file mode 100644 index 0000000..8413913 --- /dev/null +++ b/.woodpecker.yml @@ -0,0 +1,11 @@ +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 From d51547dab48491b02fd014efe810de67d336fc77 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Mon, 14 Nov 2022 11:03:11 +0100 Subject: [PATCH 05/10] use wikijs v2.5.291 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index d0f5c7d..6d69d48 100644 --- a/Dockerfile +++ b/Dockerfile @@ -18,7 +18,7 @@ RUN npm install -g \ webpack-cli \ node-gyp -ENV WIKIJS_VERSION=v2.5.285 +ENV WIKIJS_VERSION=v2.5.291 RUN git clone https://github.com/Requarks/wiki.git -b $WIKIJS_VERSION /build From 25cf78b2d6719b80c325b5b677d8b97080e48379 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Mon, 19 Dec 2022 11:04:00 +0100 Subject: [PATCH 06/10] push to 2.5.294 --- Dockerfile | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/Dockerfile b/Dockerfile index 6d69d48..245e91e 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,24 +1,25 @@ -FROM docker.io/alpine:3.16 as builder +FROM docker.io/alpine:3.17 as builder RUN apk add --no-cache \ - git \ - npm \ - bash \ - python3 \ - make \ + git \ + npm \ + bash \ + python3 \ + make \ sed #ENV NODE_ENV=production # to get around errors from differing stack sizes in musl # https://wiki.musl-libc.org/functional-differences-from-glibc.html#Thread_stack_size -RUN npm config set unsafe-perm true +#RUN npm config set unsafe-perm true +ENV NODE_OPTIONS=--openssl-legacy-provider RUN npm install -g \ webpack \ webpack-cli \ node-gyp -ENV WIKIJS_VERSION=v2.5.291 +ENV WIKIJS_VERSION=v2.5.294 RUN git clone https://github.com/Requarks/wiki.git -b $WIKIJS_VERSION /build @@ -29,7 +30,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.16 +FROM docker.io/thallian/confd-env:3.17 ENV NODE_ENV=production @@ -44,9 +45,9 @@ COPY --from=builder --chown=wikijs:wikijs /build/config.sample.yml /home/wikijs/ COPY --from=builder --chown=wikijs:wikijs /build/package.json /home/wikijs/package.json RUN apk add --no-cache \ - nodejs \ - git \ - openssh-client + nodejs \ + git \ + openssh-client ADD /rootfs / From a49f99298a0660fd55cbbff5bb29d5191d738b39 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Mon, 31 Jul 2023 11:26:58 +0200 Subject: [PATCH 07/10] push to 2.5.299 --- Dockerfile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Dockerfile b/Dockerfile index 245e91e..9d06c60 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM docker.io/alpine:3.17 as builder +FROM docker.io/alpine:3.18 as builder RUN apk add --no-cache \ git \ @@ -6,7 +6,7 @@ RUN apk add --no-cache \ bash \ python3 \ make \ - sed + sed #ENV NODE_ENV=production @@ -15,11 +15,11 @@ RUN apk add --no-cache \ #RUN npm config set unsafe-perm true ENV NODE_OPTIONS=--openssl-legacy-provider RUN npm install -g \ - webpack \ - webpack-cli \ - node-gyp + webpack \ + webpack-cli \ + node-gyp -ENV WIKIJS_VERSION=v2.5.294 +ENV WIKIJS_VERSION=v2.5.299 RUN git clone https://github.com/Requarks/wiki.git -b $WIKIJS_VERSION /build @@ -30,7 +30,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.17 +FROM docker.io/thallian/confd-env:3.18-3.1.5.0 ENV NODE_ENV=production From 3a3f5ac9905c70a62f282cd201d09f2500a27008 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Tue, 26 Sep 2023 18:11:25 +0200 Subject: [PATCH 08/10] push to 2.5.300 --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 9d06c60..e293e6b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -19,7 +19,7 @@ RUN npm install -g \ webpack-cli \ node-gyp -ENV WIKIJS_VERSION=v2.5.299 +ENV WIKIJS_VERSION=v2.5.300 RUN git clone https://github.com/Requarks/wiki.git -b $WIKIJS_VERSION /build From dabcb04d7a7551d57cb2761a21ae57aa366f7193 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Fri, 15 Dec 2023 10:25:32 +0100 Subject: [PATCH 09/10] 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 From 3958f7afec094e834f87cb44a23bbf02412bf803 Mon Sep 17 00:00:00 2001 From: Sebastian Hugentobler Date: Thu, 28 Mar 2024 15:02:27 +0100 Subject: [PATCH 10/10] push to 2.5.301 --- Containerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Containerfile b/Containerfile index 1d48018..44ad183 100644 --- a/Containerfile +++ b/Containerfile @@ -21,7 +21,7 @@ RUN npm install -g \ webpack-cli \ node-gyp -ENV WIKIJS_VERSION=v2.5.300 +ENV WIKIJS_VERSION=v2.5.301 RUN git clone https://github.com/Requarks/wiki.git -b $WIKIJS_VERSION /build