From c27e5f198593e85d8ba022e1143a50c7977d0ef2 Mon Sep 17 00:00:00 2001 From: darius Date: Wed, 15 May 2024 22:45:19 +0200 Subject: [PATCH] pipeline change --- .github/workflows/Deploy-docker.yml | 18 +++++++++++++----- docker-compose.yml | 2 ++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.github/workflows/Deploy-docker.yml b/.github/workflows/Deploy-docker.yml index 577d885..4eb4656 100644 --- a/.github/workflows/Deploy-docker.yml +++ b/.github/workflows/Deploy-docker.yml @@ -21,7 +21,7 @@ jobs: - name: Docker login run: docker login docker.kleinwizard.nl -u Darius -p ${{ secrets.DOCKER_PASSWORD }} - name: Build the Docker image - run: docker build . --file Dockerfile --tag docker.kleinwizard.nl/portfolio:latest + run: docker compose build - name: Docker push run: docker push docker.kleinwizard.nl/portfolio:latest @@ -33,11 +33,19 @@ jobs: runs-on: self-hosted steps: - - name: Docker stop - run: docker stop portfolioApi || true + - uses: actions/checkout@v3 + with: + sparse-checkout: | + docker-compose.yml + - name: copy file + run: mv docker-compose.yml /home/darius/portfolio - name: Docker login run: docker login docker.kleinwizard.nl -u Darius -p ${{ secrets.DOCKER_PASSWORD }} - name: Docker pull - run: docker pull docker.kleinwizard.nl/portfolio + run: | + cd /home/darius/portfolio + docker compose pull - name: Docker run - run: docker run --rm -d -p 4002:4002 --name portfolioApi docker.kleinwizard.nl/portfolio + run: | + cd /home/darius/portfolio + docker compose up -d diff --git a/docker-compose.yml b/docker-compose.yml index 5a5a2e3..fd5296c 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,9 @@ services: ports: - "4002:4002" restart: unless-stopped + image: docker.dariusklein.nl/portfolio-api:latest depends_on: database: condition: service_healthy +