From a61c88e5364ad1d4498fa6e9b331536b99150b37 Mon Sep 17 00:00:00 2001 From: CJ_Clippy Date: Fri, 12 Jul 2024 07:24:30 -0800 Subject: [PATCH] tweaks --- .gitea/workflows/builder.yaml | 59 ++++++++++++++++++----------------- d.strapi.dockerfile | 1 + 2 files changed, 31 insertions(+), 29 deletions(-) diff --git a/.gitea/workflows/builder.yaml b/.gitea/workflows/builder.yaml index bb62016..4a754e7 100644 --- a/.gitea/workflows/builder.yaml +++ b/.gitea/workflows/builder.yaml @@ -13,37 +13,38 @@ jobs: - uses: actions/checkout@v3 name: Check out code - - uses: mr-smithers-excellent/docker-build-push@v6 - name: Build futureporn/scout-worker - with: - image: futureporn/scout-worker - tags: latest - target: worker - registry: gitea.futureporn.net - dockerfile: d.scout.dockerfile - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} - - uses: mr-smithers-excellent/docker-build-push@v6 - name: Build futureporn/scout-manager - with: - image: futureporn/scout-manager - tags: latest - target: manager - registry: gitea.futureporn.net - dockerfile: d.scout.dockerfile - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} + # - uses: mr-smithers-excellent/docker-build-push@v6 + # name: Build futureporn/scout-worker + # with: + # image: futureporn/scout-worker + # tags: latest + # target: worker + # registry: gitea.futureporn.net + # dockerfile: d.scout.dockerfile + # username: ${{ secrets.DOCKER_USERNAME }} + # password: ${{ secrets.DOCKER_PASSWORD }} - - uses: mr-smithers-excellent/docker-build-push@v6 - name: Build futureporn/link2cid - with: - image: futureporn/link2cid - tags: latest - registry: gitea.futureporn.net - dockerfile: d.link2cid.dockerfile - username: ${{ secrets.DOCKER_USERNAME }} - password: ${{ secrets.DOCKER_PASSWORD }} + # - uses: mr-smithers-excellent/docker-build-push@v6 + # name: Build futureporn/scout-manager + # with: + # image: futureporn/scout-manager + # tags: latest + # target: manager + # registry: gitea.futureporn.net + # dockerfile: d.scout.dockerfile + # username: ${{ secrets.DOCKER_USERNAME }} + # password: ${{ secrets.DOCKER_PASSWORD }} + + # - uses: mr-smithers-excellent/docker-build-push@v6 + # name: Build futureporn/link2cid + # with: + # image: futureporn/link2cid + # tags: latest + # registry: gitea.futureporn.net + # dockerfile: d.link2cid.dockerfile + # username: ${{ secrets.DOCKER_USERNAME }} + # password: ${{ secrets.DOCKER_PASSWORD }} - uses: mr-smithers-excellent/docker-build-push@v6 name: Build futureporn/next diff --git a/d.strapi.dockerfile b/d.strapi.dockerfile index f1e86c3..e063003 100644 --- a/d.strapi.dockerfile +++ b/d.strapi.dockerfile @@ -30,6 +30,7 @@ CMD ["run", "develop"] FROM base AS strapi +WORKDIR /opt/app RUN chown -R node:node /opt/app USER node COPY --from=build /prod/strapi .