From 9ab9c55174edbf1a565627bde5bb8fd636f34684 Mon Sep 17 00:00:00 2001 From: Philip Rosenhagen Date: Wed, 18 Feb 2026 15:49:51 +0100 Subject: [PATCH 1/6] updating action --- .github/workflows/continous-deployment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/continous-deployment.yml b/.github/workflows/continous-deployment.yml index 348258e..889ef1a 100644 --- a/.github/workflows/continous-deployment.yml +++ b/.github/workflows/continous-deployment.yml @@ -50,7 +50,6 @@ jobs: key: ${{ secrets.SSH_KEY }} script: | cd /vagrant/ - docker compose down docker compose pull docker compose up -d From 5c51e5134ae6d6fcf83adb46676923a36f9e09de Mon Sep 17 00:00:00 2001 From: Philip Rosenhagen Date: Wed, 18 Feb 2026 15:52:02 +0100 Subject: [PATCH 2/6] updated compose with placeholders --- docker-compose.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/docker-compose.yml b/docker-compose.yml index 88ae2fa..3fd893b 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,6 +19,7 @@ services: - internal api: + image: xxxxxx/minitwit-api:latest build: context: . dockerfile: src/Chirp.Api/Dockerfile @@ -39,10 +40,11 @@ services: - internal web: + image: xxxxxx/minitwit-web:latest build: context: . dockerfile: src/Chirp.Web/Dockerfile - container_name: Webserver + container_name: webserver environment: - ASPNETCORE_ENVIRONMENT=Development #- ENV ASPNETCORE_URLS="http://+:5000" From 38afc1a657d545ea883c15805237c971b9f63234 Mon Sep 17 00:00:00 2001 From: Philip Rosenhagen Date: Wed, 18 Feb 2026 15:59:18 +0100 Subject: [PATCH 3/6] updated Vagrantfile --- Vagrantfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Vagrantfile b/Vagrantfile index 3ee8cdc..5277b23 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -5,7 +5,7 @@ Vagrant.configure("2") do |config| config.vm.box = 'digital_ocean' config.vm.box_url = "https://github.com/devopsgroup-io/vagrant-digitalocean/raw/master/box/digital_ocean.box" config.ssh.private_key_path = '~/.ssh/id_rsa' - config.vm.synced_folder ".", "/vagrant", type: "rsync" + config.vm.synced_folder "./docker-compose.yml", "/vagrant", type: "rsync" ######################################### # DB - API - WEBAPP (currently all deployed to same server) @@ -48,7 +48,7 @@ Vagrant.configure("2") do |config| cd /vagrant echo "Building and starting containers..." - sudo docker compose build + sudo docker compose pull sudo docker compose up -d THIS_IP=$(hostname -I | cut -d" " -f1) From a9ada4cb38cf89fc220bc926f74dd2e2aa0cca3e Mon Sep 17 00:00:00 2001 From: Philip Rosenhagen Date: Wed, 18 Feb 2026 15:59:45 +0100 Subject: [PATCH 4/6] updated Vagrantfile --- Vagrantfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Vagrantfile b/Vagrantfile index 5277b23..6622230 100644 --- a/Vagrantfile +++ b/Vagrantfile @@ -47,7 +47,7 @@ Vagrant.configure("2") do |config| sleep 3 cd /vagrant - echo "Building and starting containers..." + echo "Pulling and running containers" sudo docker compose pull sudo docker compose up -d From 31b11fc97b7440b2a81a1dc3fba9098089eb6315 Mon Sep 17 00:00:00 2001 From: Philip Rosenhagen Date: Wed, 18 Feb 2026 16:01:59 +0100 Subject: [PATCH 5/6] fixed syntax error in action --- .github/workflows/continous-deployment.yml | 1 - 1 file changed, 1 deletion(-) diff --git a/.github/workflows/continous-deployment.yml b/.github/workflows/continous-deployment.yml index 889ef1a..d3957ec 100644 --- a/.github/workflows/continous-deployment.yml +++ b/.github/workflows/continous-deployment.yml @@ -9,7 +9,6 @@ on: - master # allow manual triggers for now too workflow_dispatch: - manual: true # Remember to set the following secrets in your repository's settings: # https://github.com/your_username/itu-minitwit-ci/settings/secrets/actions From 7857454f8e31d19434beebac0b07bcc9424bcb46 Mon Sep 17 00:00:00 2001 From: Philip Rosenhagen Date: Thu, 19 Feb 2026 16:00:33 +0100 Subject: [PATCH 6/6] link to dockerhub --- docker-compose.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 3fd893b..2bf5497 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -19,7 +19,7 @@ services: - internal api: - image: xxxxxx/minitwit-api:latest + image: cecilieelkjaer/minitwit-api:latest build: context: . dockerfile: src/Chirp.Api/Dockerfile @@ -40,7 +40,7 @@ services: - internal web: - image: xxxxxx/minitwit-web:latest + image: cecilieelkjaer/minitwit-web:latest build: context: . dockerfile: src/Chirp.Web/Dockerfile