Compare commits

..
13 Commits
Author SHA1 Message Date
marc 5e9a7ccf82 needs
Docker build test / build-back (push) Canceled after 0s
Docker build test / build-front (push) Canceled after 0s
2022-10-17 06:40:23 +02:00
marc 91fa5c4f5a pull and recreate job 2022-10-17 06:38:46 +02:00
marc 4a3ffdfc0d fix dumb mistake 2022-10-17 06:31:44 +02:00
marc 02ff859c54 build front and back at the same time 2022-10-17 06:31:11 +02:00
marc 49964d06b3 build front then back 2022-10-12 05:43:40 +02:00
marc d4804bd214 touch .env 2022-09-16 19:47:47 +02:00
marc 897880c9f0 run every week to test the image resilience over external package changes 2022-09-16 19:44:37 +02:00
marc be946356ae build back and front 2022-09-16 19:37:09 +02:00
marc fea17b735c docker build test 2022-09-16 19:33:58 +02:00
marc 3301654cb7 fake .env 2022-09-16 19:09:32 +02:00
marc a98a4ca05a master only 2022-09-16 19:08:03 +02:00
marc b317fd82b3 Merge branch 'docker-compose' into github-action 2022-09-16 19:07:13 +02:00
marc 3b18e4dd36 2 github actions 2022-09-16 18:59:09 +02:00
4 changed files with 145 additions and 78 deletions
+48
View File
@@ -0,0 +1,48 @@
name: Docker build test
on:
push:
branches:
- "*"
- "!master"
# Publish `v1.2.3` tags as releases.
tags:
- v*
# Run tests for any PRs.
pull_request:
jobs:
build-back:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Fake env file
run: touch .env
- name: Build
run: docker-compose -f docker-compose.production.yml build back
build-front:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Fake env file
run: touch .env
- name: Build
run: docker-compose -f docker-compose.production.yml build front
+89
View File
@@ -0,0 +1,89 @@
name: Docker
on:
schedule:
- cron: "0 4 * * 0" # run every sunday at 4 am to test if the image builds correctly given that changes of debian or compose packages can break the image
push:
branches:
- "master"
# Publish `v1.2.3` tags as releases.
tags:
- v*
# Run tests for any PRs.
pull_request:
jobs:
build-front:
name: Build front
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to DockerHub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push front
uses: docker/build-push-action@v3
with:
context: front
dockerfile: Dockerfile
push: true
tags: numerisisep/numeris-front:latest
build-back:
name: Build back
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Set up QEMU
uses: docker/setup-qemu-action@v2
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2
- name: Login to DockerHub
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKERHUB_USERNAME }}
password: ${{ secrets.DOCKERHUB_TOKEN }}
- name: Build and push back
uses: docker/build-push-action@v3
with:
context: back
dockerfile: Dockerfile.production
push: true
tags: numerisisep/numeris-back:latest
pull-and-recreate:
name: Pull and recreate
needs:
- build-front
- build-back
runs-on: ubuntu-latest
steps:
- name: executing remote ssh commands using password
uses: appleboy/ssh-action@master
with:
host: ${{ secrets.HOST }}
username: ${{ secrets.USERNAME }}
# password: ${{ secrets.PASSWORD }}
key: ${{ secrets.KEY }}
port: ${{ secrets.PORT }}
script: |
cd numeris
git pull
docker-compose -f docker-compose.production.yml pull
docker-compose -f docker-compose.production.yml up -d --force-recreate
+5 -49
View File
@@ -3,76 +3,32 @@ services:
phpmyadmin:
image: phpmyadmin/phpmyadmin:latest
container_name: numeris_phpmyadmin
restart: unless-stopped
ports:
- 3000:80
links:
- mysql:db
depends_on:
- mysql
networks:
caddy:
labels:
caddy: phpmyadmin.numeris-isep.fr
caddy.reverse_proxy: "{{upstreams 80}}"
mysql:
image: mysql:5.7
container_name: numeris_mysql
restart: unless-stopped
env_file:
- .env
volumes:
- ./var/mysql:/var/lib/mysql
- mysql:/var/lib/mysql
back:
container_name: numeris_back
restart: unless-stopped
build:
context: ./back
dockerfile: Dockerfile
env_file:
- .env
links:
- mysql
depends_on:
- mysql
networks:
caddy:
labels:
caddy: api.numeris-isep.fr
caddy.reverse_proxy: "{{upstreams 8080}}"
front:
container_name: numeris_front
build:
context: ./front
dockerfile: Dockerfile
depends_on:
- back
networks:
caddy:
labels:
caddy: numeris-isep.fr
caddy.reverse_proxy: "{{upstreams 4200}}"
caddy:
image: marcpartensky/caddy
restart: unless-stopped
ports:
- "80:80"
- "443:443"
environment:
CADDY_INGRESS_NETWORKS: caddy
volumes:
# docker rootless daemon socket https://docs.docker.com/engine/security/rootless/
- /run/user/1000/docker.sock:/var/run/docker.sock
- caddy_data:/data
networks:
caddy:
healthcheck:
test: ["CMD", "curl", "-f", "localhost:80"]
networks:
caddy:
volumes:
caddy_data:
mysql:
+3 -29
View File
@@ -1,28 +1,14 @@
version: "3.9"
version: '3'
services:
phpmyadmin:
image: phpmyadmin/phpmyadmin:latest
container_name: numeris_phpmyadmin
ports:
- 3000:80
links:
- mysql:db
depends_on:
- mysql
volumes:
- ./var/mysql_testing:/var/lib/mysql
mysql:
image: mysql:5.7
container_name: numeris_mysql
environment:
MYSQL_DATABASE: 'numeris_testing'
MYSQL_ALLOW_EMPTY_PASSWORD: 'yes'
container_name: numeris_mysql
back:
image: numeris-back
container_name: numeris_back
build:
context: ./back
dockerfile: Dockerfile
@@ -39,16 +25,4 @@ services:
- mysql
depends_on:
- mysql
front:
image: numeris-front
container_name: numeris_front
build:
context: ./front
dockerfile: Dockerfile
ports:
- 4200:4200
links:
- back
depends_on:
- back
container_name: numeris_back