Skip to content

Commit a6bcd48

Browse files
LayoricLayoric
committed
Update docker compose deploy related files.
1 parent 5b31d85 commit a6bcd48

File tree

5 files changed

+101
-30
lines changed

5 files changed

+101
-30
lines changed

‎.deploy/nginx-proxy-compose.yml‎

Lines changed: 14 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1-
version: '2'
1+
version: "3.9"
22

33
services:
44
nginx-proxy:
5-
image: jwilder/nginx-proxy
5+
image: nginxproxy/nginx-proxy
66
container_name: nginx-proxy
77
restart: always
88
ports:
@@ -15,26 +15,32 @@ services:
1515
- dhparam:/etc/nginx/dhparam
1616
- certs:/etc/nginx/certs:ro
1717
- /var/run/docker.sock:/tmp/docker.sock:ro
18-
network_mode: bridge
18+
labels:
19+
- "com.github.jrcs.letsencrypt_nginx_proxy_companion.nginx_proxy"
1920

2021
letsencrypt:
21-
image: jrcs/letsencrypt-nginx-proxy-companion:2.0
22+
image: nginxproxy/acme-companion:2.2
2223
container_name: nginx-proxy-le
2324
restart: always
25+
depends_on:
26+
- "nginx-proxy"
2427
environment:
2528
- [email protected]
26-
volumes_from:
27-
- nginx-proxy
2829
volumes:
2930
- certs:/etc/nginx/certs:rw
3031
- acme:/etc/acme.sh
32+
- vhost:/etc/nginx/vhost.d
33+
- html:/usr/share/nginx/html
3134
- /var/run/docker.sock:/var/run/docker.sock:ro
32-
network_mode: bridge
35+
36+
networks:
37+
default:
38+
name: nginx
3339

3440
volumes:
3541
conf:
3642
vhost:
3743
html:
3844
dhparam:
3945
certs:
40-
acme:
46+
acme:

‎.github/workflows/release.yml‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ jobs:
3434
uses: actions/checkout@v3
3535
with:
3636
ref: refs/tags/${{ github.event.inputs.version }}
37-
37+
3838
# Assign environment variables used in subsequent steps
3939
- name: Env variable assignment
4040
run: echo "image_repository_name=$(echo ${{ github.repository }} | tr '[:upper:]' '[:lower:]')" >> $GITHUB_ENV
@@ -48,7 +48,7 @@ jobs:
4848
if [ "${{ github.event.inputs.version }}" != "" ]; then
4949
echo "TAG_NAME=${{ github.event.inputs.version }}" >> $GITHUB_ENV
5050
fi;
51-
51+
5252
- name: Login to GitHub Container Registry
5353
uses: docker/login-action@v2
5454
with:
@@ -94,29 +94,27 @@ jobs:
9494
echo "TAG_NAME=${{ github.event.inputs.version }}" >> $GITHUB_ENV
9595
fi;
9696
97-
# Populate docker-compose.yml with variables from build process, including TAG_NAME.
98-
- name: docker-compose file prep
99-
uses: danielr1996/[email protected]
100-
env:
101-
RELEASE_VERSION: ${{ env.TAG_NAME }}
102-
IMAGE_REPO: ${{ env.image_repository_name }}
103-
APP_NAME: ${{ github.event.repository.name }}
104-
HOST_DOMAIN: ${{ env.domain }}
105-
LETSENCRYPT_EMAIL: ${{ env.letsencrypt_email }}
106-
with:
107-
input: .deploy/docker-compose-template.yml
108-
output: .deploy/${{ github.event.repository.name }}-docker-compose.yml
97+
- name: Create .env file
98+
run: |
99+
echo "Generating .env file"
100+
101+
echo "# Autogenerated .env file" > .env
102+
echo "HOST_DOMAIN=${{ secrets.DEPLOY_HOST }}" >> .env
103+
echo "LETSENCRYPT_EMAIL=${{ secrets.LETSENCRYPT_EMAIL }}" >> .env
104+
echo "APP_NAME=${{ github.event.repository.name }}" >> .env
105+
echo "IMAGE_REPO=${{ env.image_repository_name }}" >> .env
106+
echo "RELEASE_VERSION=${{ env.TAG_NAME }}" >> .env
109107
110108
# Copy only the docker-compose.yml to remote server home folder
111-
- name: copy compose file via scp
109+
- name: copy files to target server via scp
112110
uses: appleboy/[email protected]
113111
with:
114112
host: ${{ secrets.DEPLOY_HOST }}
115113
username: ${{ secrets.DEPLOY_USERNAME }}
116114
port: 22
117115
key: ${{ secrets.DEPLOY_KEY }}
118-
source: ".deploy/${{ github.event.repository.name }}-docker-compose.yml"
119-
target: "~/"
116+
source: "./docker-compose.yml,./docker-compose.prod.yml,./.env"
117+
target: "~/.deploy/${{ github.event.repository.name }}/"
120118

121119
- name: Run remote db migrations
122120
uses: appleboy/[email protected]
@@ -131,10 +129,11 @@ jobs:
131129
envs: APPTOKEN,USERNAME
132130
script: |
133131
echo $APPTOKEN | docker login ghcr.io -u $USERNAME --password-stdin
134-
docker-compose -f ~/.deploy/${{ github.event.repository.name }}-docker-compose.yml pull
135-
docker-compose -f ~/.deploy/${{ github.event.repository.name }}-docker-compose.yml up ${{ github.event.repository.name }}-migration
132+
cd ~/.deploy/${{ github.event.repository.name }}
133+
docker compose -f ./docker-compose.yml -f ./docker-compose.prod.yml pull
134+
docker compose -f ./docker-compose.yml -f ./docker-compose.prod.yml up app-migration
136135
137-
# Deploy Docker image with ServiceStack application using `docker compose up` remotely
136+
# Deploy Docker image with your application using `docker compose up` remotely
138137
- name: remote docker-compose up via ssh
139138
uses: appleboy/[email protected]
140139
env:
@@ -148,5 +147,6 @@ jobs:
148147
envs: APPTOKEN,USERNAME
149148
script: |
150149
echo $APPTOKEN | docker login ghcr.io -u $USERNAME --password-stdin
151-
docker-compose -f ~/.deploy/${{ github.event.repository.name }}-docker-compose.yml pull
152-
docker-compose -f ~/.deploy/${{ github.event.repository.name }}-docker-compose.yml up -d
150+
cd ~/.deploy/${{ github.event.repository.name }}
151+
docker compose -f ./docker-compose.yml -f ./docker-compose.prod.yml pull
152+
docker compose -f ./docker-compose.yml -f ./docker-compose.prod.yml up app -d

‎docker-compose.override.yml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
version: "3.9"
2+
services:
3+
app:
4+
build: .
5+
ports:
6+
- "5000:80"
7+
volumes:
8+
- app-mydb:/app/App_Data
9+
app-migration:
10+
build: .
11+
restart: "no"
12+
profiles:
13+
- migration
14+
command: --AppTasks=migrate
15+
volumes:
16+
- app-mydb:/app/App_Data
17+
18+
volumes:
19+
app-mydb:

‎docker-compose.prod.yml‎

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
version: "3.9"
2+
services:
3+
app:
4+
image: ghcr.io/${IMAGE_REPO}:${RELEASE_VERSION}
5+
restart: always
6+
ports:
7+
- "80"
8+
container_name: ${APP_NAME}_app
9+
environment:
10+
VIRTUAL_HOST: ${HOST_DOMAIN}
11+
LETSENCRYPT_HOST: ${HOST_DOMAIN}
12+
LETSENCRYPT_EMAIL: ${LETSENCRYPT_EMAIL}
13+
volumes:
14+
- app-mydb:/app/App_Data
15+
app-migration:
16+
image: ghcr.io/${IMAGE_REPO}:${RELEASE_VERSION}
17+
restart: "no"
18+
container_name: ${APP_NAME}_app_migration
19+
profiles:
20+
- migration
21+
command: --AppTasks=migrate
22+
volumes:
23+
- app-mydb:/app/App_Data
24+
25+
networks:
26+
default:
27+
external: true
28+
name: nginx
29+
30+
volumes:
31+
app-mydb:

‎docker-compose.yml‎

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
version: "3.9"
2+
services:
3+
app:
4+
volumes:
5+
- app-mydb:/app/App_Data
6+
app-migration:
7+
restart: "no"
8+
profiles:
9+
- migration
10+
command: --AppTasks=migrate
11+
volumes:
12+
- app-mydb:/app/App_Data
13+
14+
volumes:
15+
app-mydb:

0 commit comments

Comments
 (0)