diff --git a/.github/workflows/build-containers.yml b/.github/workflows/build-containers.yml index b6ec927b..4d089a88 100644 --- a/.github/workflows/build-containers.yml +++ b/.github/workflows/build-containers.yml @@ -15,14 +15,6 @@ jobs: with: fetch-depth: 0 - - name: Setup node - uses: actions/setup-node@v4 - with: - node-version: '20.17' - cache: 'npm' - cache-dependency-path: | - **/package-lock.json - - name: Login to ghcr uses: docker/login-action@v3 with: @@ -31,7 +23,7 @@ jobs: password: ${{ github.token }} - name: docker build - run: npm run docker-build + run: /var/run/docker-build.sh - name: docker tag run: | diff --git a/package.json b/package.json index efd4a817..bda70c5e 100644 --- a/package.json +++ b/package.json @@ -20,8 +20,8 @@ "prisma-generate": "cd ./libraries/nestjs-libraries/src/database/prisma && npx prisma generate", "prisma-db-push": "cd ./libraries/nestjs-libraries/src/database/prisma && npx prisma db push", "prisma-reset": "cd ./libraries/nestjs-libraries/src/database/prisma && npx prisma db push --force-reset && npx prisma db push", - "docker-build": "docker rmi localhost/postiz || true && docker build --target dist -t localhost/postiz -f Dockerfile . && docker build --target devcontainer -t localhost/postiz-devcontainer -f Dockerfile .", - "docker-create": "docker kill postiz || true && docker rm postiz || true && docker create --name postiz -p 3000:3000 -p 4200:4200 localhost/postiz", + "docker-build": "./var/docker/docker-build.sh", + "docker-create": "./var/docker/docker-create.sh", "postinstall": "npm run prisma-generate" }, "private": true, diff --git a/var/docker/docker-build.sh b/var/docker/docker-build.sh new file mode 100755 index 00000000..bdbc83d8 --- /dev/null +++ b/var/docker/docker-build.sh @@ -0,0 +1,5 @@ +#!/bin/bash + +docker rmi localhost/postiz || true +docker build --target dist -t localhost/postiz -f Dockerfile . +docker build --target devcontainer -t localhost/postiz-devcontainer -f Dockerfile . diff --git a/var/docker/docker-create.sh b/var/docker/docker-create.sh new file mode 100644 index 00000000..9b8fda99 --- /dev/null +++ b/var/docker/docker-create.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash + +docker kill postiz || true +docker rm postiz || true +docker create --name postiz -p 3000:3000 -p 4200:4200 localhost/postiz