diff --git a/.github/workflows/build_release.yml b/.github/workflows/build_release.yml index 797bd9fa..f943b763 100644 --- a/.github/workflows/build_release.yml +++ b/.github/workflows/build_release.yml @@ -90,8 +90,9 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push to Docker Hub if: ${{ steps.checkdocker.outputs.secretspresent }} - uses: docker/build-push-action@v5.0.0 + uses: docker/build-push-action@v6 with: + context: "." platforms: linux/amd64, linux/arm64 push: true tags: | @@ -110,9 +111,10 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push to GHCR - uses: docker/build-push-action@v5.0.0 + uses: docker/build-push-action@v6 with: platforms: linux/amd64, linux/arm64 + context: "." file: ./Dockerfile push: true tags: | @@ -164,8 +166,9 @@ jobs: password: ${{ secrets.DOCKERHUB_TOKEN }} - name: Build and push to Docker Hub (bun) if: ${{ steps.checkdocker.outputs.secretspresent }} - uses: docker/build-push-action@v5.1.0 + uses: docker/build-push-action@v6 with: + context: "." platforms: linux/amd64, linux/arm64 file: ./Dockerfile_bun push: true @@ -183,8 +186,9 @@ jobs: username: ${{ github.actor }} password: ${{ secrets.GITHUB_TOKEN }} - name: Build and push to GHCR (bun) - uses: docker/build-push-action@v5.1.0 + uses: docker/build-push-action@v6 with: + context: "." platforms: linux/amd64, linux/arm64 file: ./Dockerfile_bun push: true diff --git a/.github/workflows/test_release.yml b/.github/workflows/test_release.yml deleted file mode 100644 index fcc74794..00000000 --- a/.github/workflows/test_release.yml +++ /dev/null @@ -1,53 +0,0 @@ -name: 'CI+CD' - -on: - pull_request: - branches: [ master, beta ] - paths-ignore: - - '**.md' - workflow_dispatch: - inputs: - TAG_NAME: - description: 'Release Version Tag (0.0.0)' - required: true - -jobs: - node: - name: 'Build & Test Node' - runs-on: ubuntu-latest - steps: - - uses: actions/checkout@v4.1.1 - with: - ref: ${{ github.ref }} - - name: Check Docker secret presence - id: checkdocker - shell: bash - run: | - if [ "$SECRET" == "" ]; then - echo "secretspresent=false" >> $GITHUB_OUTPUT - else - echo "secretspresent=true" >> $GITHUB_OUTPUT - fi - env: - SECRET: ${{ secrets.DOCKERHUB_TOKEN }} - - name: build qryn-view - uses: ./.github/actions/get-view - env: - TAG: v3.3.2 - - name: Set up Docker QEMU - if: ${{ steps.checkdocker.outputs.secretspresent }} - uses: docker/setup-qemu-action@v3.0.0 - with: - platforms: amd64, arm64 - - name: Set up Docker Buildx - if: ${{ steps.checkdocker.outputs.secretspresent }} - uses: docker/setup-buildx-action@v3.0.0 - - name: Build and push to Docker Hub - if: ${{ steps.checkdocker.outputs.secretspresent }} - uses: docker/build-push-action@v6 - with: - context: "." - platforms: linux/amd64, linux/arm64 - push: false - tags: | - qxip/qryn:latest diff --git a/Dockerfile b/Dockerfile index ca7aa971..4e382c1c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -4,8 +4,6 @@ FROM node:20.10-slim COPY . /app WORKDIR /app -RUN cd view && ls - RUN groupadd -r qryn && useradd -r -g qryn -m qryn && chown -R qryn:qryn /app USER qryn