update to 3.6.0

.github/workflows/main.yml

@@ -0,0 +1,30 @@
+name: CI
+
+# Controls when the action will run. Triggers the workflow on push or pull request
+# events but only for the master branch
+on:
+  push:
+    branches: [ 3.6.0 ]
+  pull_request:
+    branches: [ 3.6.0 ]
+
+# A workflow run is made up of one or more jobs that can run sequentially or in parallel
+jobs:
+  # This workflow contains a single job called "build"
+  build:
+    # The type of runner that the job will run on
+    runs-on: ubuntu-latest
+
+    # Steps represent a sequence of tasks that will be executed as part of the job
+    steps:
+    # Checks-out your repository under $GITHUB_WORKSPACE, so your job can access it
+    - uses: actions/checkout@v2
+
+    - name: Push image to AppVenture registry
+      uses: docker/build-push-action@v1
+      with:
+        username: ${{ secrets.DOCKER_USERNAME }}
+        password: ${{ secrets.DOCKER_PASSWORD }}
+        registry: registry.nush.app
+        repository: ctfd
+        tags: latest

docker-compose.yml

@@ -2,7 +2,7 @@ version: '2'
 
 services:
   ctfd:
-    build: .
+    image: registry.nush.app/ctfd:latest
     user: root
     restart: always
     ports:
@@ -15,26 +15,20 @@ services:
       - LOG_FOLDER=/var/log/CTFd
       - ACCESS_LOG=-
       - ERROR_LOG=-
-      - REVERSE_PROXY=true
     volumes:
       - .data/CTFd/logs:/var/log/CTFd
       - .data/CTFd/uploads:/var/uploads
-      - .:/opt/CTFd:ro
     depends_on:
       - db
     networks:
-        default:
+        primary:
         internal:
-
-  nginx:
-    image: nginx:stable
-    restart: always
-    volumes:
-      - ./conf/nginx/http.conf:/etc/nginx/nginx.conf
-    ports:
-      - 80:80
-    depends_on:
-      - ctfd
+    labels:
+    - "traefik.enable=true"
+    - "traefik.http.routers.ctfd.rule=Host(`ctfd.nush.app`)"
+    - "traefik.http.routers.ctfd.entrypoints=https"
+    - "traefik.http.routers.ctfd.tls=true"
+    - "traefik.http.routers.ctfd.tls.certresolver=tlsresolver"
 
   db:
     image: mariadb:10.4.12
@@ -60,6 +54,8 @@ services:
         internal:
 
 networks:
-    default:
+    primary:
+      external:
+        name: primary
     internal:
         internal: true