Skip to content

Commit

Permalink
use ghcr for some stuff
Browse files Browse the repository at this point in the history
  • Loading branch information
Yey007 committed Dec 14, 2020
1 parent d92e9a1 commit 654cd9d
Show file tree
Hide file tree
Showing 4 changed files with 41 additions and 5 deletions.
6 changes: 3 additions & 3 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -24,9 +24,9 @@ jobs:

- name: Run tests
run: |
if [ -f docker-compose.github.test.yml ]; then
docker-compose --file docker-compose.github.test.yml build
docker-compose --file docker-compose.github.test.yml run sut
if [ -f docker-compose.ci.yml ]; then
docker-compose --file docker-compose.ci.yml build
docker-compose --file docker-compose.ci.yml run sut
else
docker build . --file Dockerfile
fi
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.github.test.yml → docker-compose.ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ services:
build:
context: ./
dockerfile: Dockerfile.test
image: yey007/transcriberbot:latest
image: ghcr.io/yey007/transcriberbot:latest
command: sh -c "./wait-for db:3306 -- npm test"
environment:
- DISCORD_TOKEN
Expand Down
36 changes: 36 additions & 0 deletions docker-compose.dev.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
version: '3.8'

services:
bot:
privileged: true
container_name: bot
build: ./
image: yey007/transcriberbot:latest
restart: always
command: sh -c "./wait-for db:3306 -- npm start"
env_file:
- ./bot.env
- ./db.env
environment:
- NODE_ENV=development
depends_on:
- db
networks:
- my_network

db:
container_name: db
image: mysql
command: --default-authentication-plugin=mysql_native_password
restart: always
env_file:
- ./db.env
expose:
- 3306
networks:
- my_network

networks:
my_network:
name: my_network
driver: bridge
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ services:
privileged: true
container_name: bot
build: ./
image: yey007/transcriberbot:latest
image: ghcr.io/yey007/transcriberbot:latest
restart: always
command: sh -c "./wait-for db:3306 -- npm start"
env_file:
Expand Down

0 comments on commit 654cd9d

Please sign in to comment.