Skip to content

Commit

Permalink
Simplifying plugin installation
Browse files Browse the repository at this point in the history
  • Loading branch information
bitbyt3r committed Feb 5, 2023
1 parent 36dd408 commit 4332845
Show file tree
Hide file tree
Showing 3 changed files with 49 additions and 23 deletions.
21 changes: 0 additions & 21 deletions .github/workflows/ci-docker.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -10,34 +10,13 @@ jobs:
- name: Checkout Code
uses: actions/checkout@v1

- name: Checkout Plugins
uses: actions/checkout@v1
with:
repository: 'magfest/covid'
path: magwest/plugins/covid
ref: west2022

- name: Log Files
run: |
echo "Listing files..."
pwd
ls
find
- name: Login to GHCR
uses: docker/login-action@v1
with:
registry: ghcr.io
username: ${{ github.repository_owner }}
password: ${{ secrets.GITHUB_TOKEN }}

- name: Log More Files
run: |
echo "Listing files..."
pwd
ls
find
- name: Build and Push Docker Image
uses: docker/build-push-action@v2
with:
Expand Down
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
FROM ghcr.io/magfest/ubersystem:west2022

# add our code
# install plugins
COPY . plugins/magwest/
RUN if [ -d plugins/magwest/plugins ]; then echo "copying plugins"; ls plugins/magwest/plugins/*; mv plugins/magwest/plugins/* plugins/; fi
RUN git clone --depth 1 --branch west2022 https://github.com/magfest/covid.git plugins/covid

RUN /app/env/bin/paver install_deps
46 changes: 46 additions & 0 deletions docker-compose.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
# docker-compose for development of ubersystem

services:
web:
platform: linux/amd64
build: .
ports:
- 80:80
environment:
- DB_CONNECTION_STRING=postgresql://uber_db:uber_db@db:5432/uber_db
- PORT=80
volumes:
- type: bind
source: .
target: /app/plugins/magwest
db:
platform: linux/amd64
image: postgres
environment:
- POSTGRES_PASSWORD=uber_db
- POSTGRES_USER=uber_db
- POSTGRES_DB=uber_db
redis:
platform: linux/amd64
image: redis
rabbitmq:
platform: linux/arm64/v8
ports:
- "5672"
image: rabbitmq
environment:
- RABBITMQ_DEFAULT_USER=celery
- RABBITMQ_DEFAULT_PASS=celery
- RABBITMQ_DEFAULT_VHOST=uber
celery-beat:
platform: linux/amd64
build: .
command: ['celery-beat']
environment:
- DB_CONNECTION_STRING=postgresql://uber_db:uber_db@db:5432/uber_db
celery-worker:
platform: linux/amd64
build: .
command: ['celery-worker']
environment:
- DB_CONNECTION_STRING=postgresql://uber_db:uber_db@db:5432/uber_db

0 comments on commit 4332845

Please sign in to comment.