Skip to content

Commit

Permalink
Prepare docker deploy
Browse files Browse the repository at this point in the history
  • Loading branch information
slhmy committed Oct 1, 2024
1 parent 7e83979 commit 35035ea
Show file tree
Hide file tree
Showing 5 changed files with 20 additions and 5 deletions.
4 changes: 4 additions & 0 deletions .github/workflows/docker-publish-platform.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,10 @@ jobs:
- name: Checkout repository
uses: actions/checkout@v4

- name: Get Frontend dist
run: |
make update-front
# Install the cosign tool except on PR
# https://github.com/sigstore/cosign-installer
- name: Install cosign
Expand Down
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ bin/
__debug_bin**

# Ignore override config files
override.*
*override.*
!override.example.toml

frontend/
Expand Down
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,9 +14,9 @@ FROM ubuntu:latest
WORKDIR /platform

COPY --from=build /workdir/bin/ /usr/local/bin/
COPY --from=build /workdir/frontend/dist ./frontend_dist
COPY --from=build /workdir/frontend/dist frontend/dist

COPY config.toml ./config.toml
COPY config.toml config.toml

ENV OJ_LAB_SERVICE_ENV='production'
ENV DATABASE_DSN='user=postgres password=postgres host=host.docker.internal port=5432 dbname=oj_lab sslmode=disable TimeZone=Asia/Shanghai'
Expand Down
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
OS := $(shell uname -s)

FRONTEND_DIST_DIR := frontend/dist
FRONTEND_DIST_URL := https://github.com/oj-lab/frontend/releases/download/v0.0.3/dist.zip
FRONTEND_DIST_URL := https://github.com/oj-lab/frontend/releases/download/v0.1.0/dist.zip
ICPC_PROBLEM_PACKAGES_DIR := problem-packages/icpc
ICPC_PROBLEM_PACKAGES_URL := https://github.com/oj-lab/problem-packages/releases/download/v0.0.1/icpc_problem.zip

Expand Down
13 changes: 12 additions & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,4 +58,15 @@ services:
environment:
- ENABLE_RCLONE=true
ports:
- 8000:8000
- 8000:8000

platform:
image: ghcr.io/oj-lab/platform:main
pull_policy: always
extra_hosts:
- "host.docker.internal:host-gateway"
ports:
- 8080:8080
volumes:
- ./frontend:/workdir/frontend
- ./override.docker.toml:/workdir/override.toml

0 comments on commit 35035ea

Please sign in to comment.