From 3ef024699d9def912e8ac17247d4c7bea4940950 Mon Sep 17 00:00:00 2001 From: tico88612 <17496418+tico88612@users.noreply.github.com> Date: Mon, 12 Dec 2022 00:07:20 +0800 Subject: [PATCH 1/6] add(actions): cms-base build --- .env.example | 4 +++- .github/workflows/build.yml | 31 +++++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) create mode 100644 .github/workflows/build.yml diff --git a/.env.example b/.env.example index 4cabb66..aef8a51 100644 --- a/.env.example +++ b/.env.example @@ -7,4 +7,6 @@ CMS_ADMIN_USER= CMS_ADMIN_PASSWORD= CMS_RANKING_USER=ranking -CMS_RANKING_PASSWORD= \ No newline at end of file +CMS_RANKING_PASSWORD= + +# CMS_CONTEST_ID=1 # If CMS_CONTEST_ID not specified, contest will list all. \ No newline at end of file diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml new file mode 100644 index 0000000..5a949d4 --- /dev/null +++ b/.github/workflows/build.yml @@ -0,0 +1,31 @@ +name: CMS Base Image + +on: + push: + branches: [ "master", "feature/github-actions" ] + # paths: + # - 'images/**' + +jobs: + base-build: + name: CMS Base Image Build + runs-on: ubuntu-20.04 + steps: + - name: Checkout Repository + uses: actions/checkout@v3 + with: + submodules: true + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 + - name: Login to Docker Hub + uses: docker/login-action@v2 + with: + username: ${{ secrets.DOCKERHUB_USERNAME }} + password: ${{ secrets.DOCKERHUB_TOKEN }} + - name: CMS Base Image Build & push + uses: docker/build-push-action@v3 + with: + file: images/cms-base/Dockerfile + context: . + push: true + tags: tico88612/cms-base:latest From de5a44a679ad1cfa2e9e7b0e378feb55b087b9ff Mon Sep 17 00:00:00 2001 From: tico88612 <17496418+tico88612@users.noreply.github.com> Date: Tue, 13 Dec 2022 00:01:55 +0800 Subject: [PATCH 2/6] edit(cms-base): compile worker --- .gitignore | 1 + images/cms-base/Dockerfile | 1 + 2 files changed, 2 insertions(+) diff --git a/.gitignore b/.gitignore index 4c49bd7..8efe85b 100644 --- a/.gitignore +++ b/.gitignore @@ -1 +1,2 @@ .env +data/** \ No newline at end of file diff --git a/images/cms-base/Dockerfile b/images/cms-base/Dockerfile index 132a21d..2c59785 100644 --- a/images/cms-base/Dockerfile +++ b/images/cms-base/Dockerfile @@ -3,6 +3,7 @@ FROM ubuntu:20.04 RUN mkdir /cms RUN mkdir /scripts +ENV HOME=/cms ENV PYTHONPATH=/cms WORKDIR /cms From ee0585dd51a8a362f776f9951049e6ca65f31a19 Mon Sep 17 00:00:00 2001 From: tico88612 <17496418+tico88612@users.noreply.github.com> Date: Tue, 13 Dec 2022 00:40:47 +0800 Subject: [PATCH 3/6] test(actions): add qemu --- .github/workflows/build.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5a949d4..94f726e 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,6 +15,8 @@ jobs: uses: actions/checkout@v3 with: submodules: true + - name: Set up QEMU + uses: docker/setup-qemu-action@v2 - name: Set up Docker Buildx uses: docker/setup-buildx-action@v2 - name: Login to Docker Hub From 9afd0ed42ffbbf74ffd51bcdf2299e54c0619197 Mon Sep 17 00:00:00 2001 From: tico88612 <17496418+tico88612@users.noreply.github.com> Date: Tue, 13 Dec 2022 00:55:21 +0800 Subject: [PATCH 4/6] test(actions): delete --- .github/workflows/build.yml | 4 ---- 1 file changed, 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 94f726e..94edf14 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,10 +15,6 @@ jobs: uses: actions/checkout@v3 with: submodules: true - - name: Set up QEMU - uses: docker/setup-qemu-action@v2 - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - name: Login to Docker Hub uses: docker/login-action@v2 with: From 60e7c7dd9d0af7849d2f4c782efe01fac5b08cbd Mon Sep 17 00:00:00 2001 From: tico88612 <17496418+tico88612@users.noreply.github.com> Date: Tue, 13 Dec 2022 09:32:25 +0800 Subject: [PATCH 5/6] test(actions): env to arg --- .github/workflows/build.yml | 2 ++ images/cms-base/Dockerfile | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 94edf14..5a949d4 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,6 +15,8 @@ jobs: uses: actions/checkout@v3 with: submodules: true + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v2 - name: Login to Docker Hub uses: docker/login-action@v2 with: diff --git a/images/cms-base/Dockerfile b/images/cms-base/Dockerfile index 2c59785..74eedae 100644 --- a/images/cms-base/Dockerfile +++ b/images/cms-base/Dockerfile @@ -3,8 +3,8 @@ FROM ubuntu:20.04 RUN mkdir /cms RUN mkdir /scripts -ENV HOME=/cms -ENV PYTHONPATH=/cms +ARG HOME=/cms +ARG PYTHONPATH=/cms WORKDIR /cms # copy cms system From 8d7c9649527214ad1d920eb25474f75541e04d2c Mon Sep 17 00:00:00 2001 From: tico88612 <17496418+tico88612@users.noreply.github.com> Date: Tue, 13 Dec 2022 10:51:07 +0800 Subject: [PATCH 6/6] restore --- .github/workflows/build.yml | 2 -- images/cms-base/Dockerfile | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 5a949d4..94edf14 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -15,8 +15,6 @@ jobs: uses: actions/checkout@v3 with: submodules: true - - name: Set up Docker Buildx - uses: docker/setup-buildx-action@v2 - name: Login to Docker Hub uses: docker/login-action@v2 with: diff --git a/images/cms-base/Dockerfile b/images/cms-base/Dockerfile index 74eedae..132a21d 100644 --- a/images/cms-base/Dockerfile +++ b/images/cms-base/Dockerfile @@ -3,8 +3,7 @@ FROM ubuntu:20.04 RUN mkdir /cms RUN mkdir /scripts -ARG HOME=/cms -ARG PYTHONPATH=/cms +ENV PYTHONPATH=/cms WORKDIR /cms # copy cms system