Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/workflows/continous-deployment.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -50,7 +49,6 @@ jobs:
key: ${{ secrets.SSH_KEY }}
script: |
cd /vagrant/
docker compose down
docker compose pull
docker compose up -d

Expand Down
6 changes: 3 additions & 3 deletions Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down Expand Up @@ -47,8 +47,8 @@ Vagrant.configure("2") do |config|
sleep 3

cd /vagrant
echo "Building and starting containers..."
sudo docker compose build
echo "Pulling and running containers"
sudo docker compose pull
sudo docker compose up -d

THIS_IP=$(hostname -I | cut -d" " -f1)
Expand Down
4 changes: 3 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ services:
- internal

api:
image: cecilieelkjaer/minitwit-api:latest
build:
context: .
dockerfile: src/Chirp.Api/Dockerfile
Expand All @@ -39,10 +40,11 @@ services:
- internal

web:
image: cecilieelkjaer/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"
Expand Down