From 29aca8ecbb367aa1e31de6925d8089f901fd6686 Mon Sep 17 00:00:00 2001 From: Giulio Date: Sun, 20 Jun 2021 19:49:31 +0200 Subject: [PATCH 01/24] fix indentation again --- backend/bang/players.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/backend/bang/players.py b/backend/bang/players.py index ef25c7b..c220a0d 100644 --- a/backend/bang/players.py +++ b/backend/bang/players.py @@ -435,8 +435,8 @@ class Player: return self.notify_self() if self.game.check_event(ceh.IlTreno) or (self.is_ghost and self.game.check_event(ceh.CittaFantasma)): self.hand.append(self.game.deck.draw()) - self.notify_self() self.manette() + self.notify_self() def manette(self): if self.game.check_event(ceh.Manette): From dc1d39a66e37a5792d13fcfbcc70552de9f4ba61 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Jun 2021 04:29:20 +0000 Subject: [PATCH 02/24] Bump vue-i18n from 8.24.4 to 8.24.5 in /frontend Bumps [vue-i18n](https://github.com/kazupon/vue-i18n) from 8.24.4 to 8.24.5. - [Release notes](https://github.com/kazupon/vue-i18n/releases) - [Changelog](https://github.com/kazupon/vue-i18n/blob/v8.x/CHANGELOG.md) - [Commits](https://github.com/kazupon/vue-i18n/compare/v8.24.4...v8.24.5) --- updated-dependencies: - dependency-name: vue-i18n dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 586b1f3..3f83ab7 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -14,7 +14,7 @@ "socket.io-client": "^4.1.2", "vue": "^2.6.14", "vue-clipboard2": "^0.3.1", - "vue-i18n": "^8.24.4", + "vue-i18n": "^8.24.5", "vue-router": "^3.5.1", "vue-socket.io": "^3.0.10" }, diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 02c8865..287163d 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -8753,10 +8753,10 @@ vue-hot-reload-api@^2.3.0: resolved "https://registry.npm.taobao.org/vue-hot-reload-api/download/vue-hot-reload-api-2.3.4.tgz#532955cc1eb208a3d990b3a9f9a70574657e08f2" integrity sha1-UylVzB6yCKPZkLOp+acFdGV+CPI= -vue-i18n@^8.24.4: - version "8.24.4" - resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.24.4.tgz#b158614c1df7db183d9cadddbb73e1d540269492" - integrity sha512-RZE94WUAGxEiBAANxQ0pptbRwDkNKNSXl3fnJslpFOxVMF6UkUtMDSuYGuW2blDrVgweIXVpethOVkYoNNT9xw== +vue-i18n@^8.24.5: + version "8.24.5" + resolved "https://registry.yarnpkg.com/vue-i18n/-/vue-i18n-8.24.5.tgz#7127a666d5be2199be69be39e439a419a90ff931" + integrity sha512-p8W5xOmniuZ8fj76VXe0vBL3bRWVU87jHuC/v8VwmhKVH2iMQsKnheB1U+umxDBqC/5g9K+NwzokepcLxnBAVQ== "vue-loader-v16@npm:vue-loader@^16.1.0": version "16.2.0" From c9114493ee35abf38de6921f9e479309e121f91b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 21 Jun 2021 04:29:29 +0000 Subject: [PATCH 03/24] Bump core-js from 3.14.0 to 3.15.0 in /frontend Bumps [core-js](https://github.com/zloirock/core-js/tree/HEAD/packages/core-js) from 3.14.0 to 3.15.0. - [Release notes](https://github.com/zloirock/core-js/releases) - [Changelog](https://github.com/zloirock/core-js/blob/master/CHANGELOG.md) - [Commits](https://github.com/zloirock/core-js/commits/v3.15.0/packages/core-js) --- updated-dependencies: - dependency-name: core-js dependency-type: direct:production update-type: version-update:semver-minor ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 586b1f3..89d2690 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -8,7 +8,7 @@ "lint": "vue-cli-service lint" }, "dependencies": { - "core-js": "^3.14.0", + "core-js": "^3.15.0", "pretty-checkbox-vue": "^1.1.9", "register-service-worker": "^1.7.2", "socket.io-client": "^4.1.2", diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 02c8865..92fa9a8 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -2929,10 +2929,10 @@ core-js@^2.4.0: resolved "https://registry.npm.taobao.org/core-js/download/core-js-2.6.12.tgz?cache=0&sync_timestamp=1606326948512&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcore-js%2Fdownload%2Fcore-js-2.6.12.tgz#d9333dfa7b065e347cc5682219d6f690859cc2ec" integrity sha1-2TM9+nsGXjR8xWgiGdb2kIWcwuw= -core-js@^3.14.0, core-js@^3.6.5: - version "3.14.0" - resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.14.0.tgz#62322b98c71cc2018b027971a69419e2425c2a6c" - integrity sha512-3s+ed8er9ahK+zJpp9ZtuVcDoFzHNiZsPbNAAE4KXgrRHbjSqqNN6xGSXq6bq7TZIbKj4NLrLb6bJ5i+vSVjHA== +core-js@^3.15.0, core-js@^3.6.5: + version "3.15.0" + resolved "https://registry.yarnpkg.com/core-js/-/core-js-3.15.0.tgz#db9554ebce0b6fd90dc9b1f2465c841d2d055044" + integrity sha512-GUbtPllXMYRzIgHNZ4dTYTcUemls2cni83Q4Q/TrFONHfhcg9oEGOtaGHfb0cpzec60P96UKPvMkjX1jET8rUw== core-util-is@1.0.2, core-util-is@~1.0.0: version "1.0.2" From 068ce5da00a2796958eeeb5d8dfe4b1119e5e6ef Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Mon, 21 Jun 2021 15:20:19 +0200 Subject: [PATCH 04/24] Update dev-image.yml --- .github/workflows/dev-image.yml | 59 +++++++++++++++++++++++++++------ 1 file changed, 49 insertions(+), 10 deletions(-) diff --git a/.github/workflows/dev-image.yml b/.github/workflows/dev-image.yml index e9d8ec4..031b54d 100644 --- a/.github/workflows/dev-image.yml +++ b/.github/workflows/dev-image.yml @@ -3,15 +3,54 @@ on: push: branches: [ dev ] jobs: - build: + docker: runs-on: ubuntu-latest - env: - DOCKER_BUILDKIT: '1' steps: - - uses: actions/checkout@v2 - - name: Build the Unified Docker image - run: docker build . --file Dockerfile --tag albertoxamin/bang:dev - - name: Log into registry - run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin - - name: Push images - run: docker push albertoxamin/bang:dev + - name: Checkout + uses: actions/checkout@v2 + + - name: Prepare + id: prep + run: | + DOCKER_IMAGE=${{ secrets.DOCKER_USERNAME }}/${GITHUB_REPOSITORY#*/} + VERSION=latest + SHORTREF=${GITHUB_SHA::8} + + TAGS="${DOCKER_IMAGE}:dev,${DOCKER_IMAGE}:${SHORTREF}" + + # If the VERSION looks like a version number, assume that + # this is the most recent version of the image and also + # tag it 'latest'. + if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then + TAGS="$TAGS,${DOCKER_IMAGE}:latest" + fi + + # Set output parameters. + echo ::set-output name=tags::${TAGS} + echo ::set-output name=docker_image::${DOCKER_IMAGE} + + - name: Set up QEMU + uses: docker/setup-qemu-action@master + with: + platforms: all + + - name: Set up Docker Buildx + id: buildx + uses: docker/setup-buildx-action@master + + - name: Login to DockerHub + if: github.event_name != 'pull_request' + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + + - name: Build + uses: docker/build-push-action@v2 + with: + builder: ${{ steps.buildx.outputs.name }} + context: . + file: ./Dockerfile + platforms: linux/amd64,linux/arm64,linux/ppc64le + push: true + tags: ${{ steps.prep.outputs.tags }} From 9f1dc376f4b919efb7aedc3edf32038ccc542d30 Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Mon, 21 Jun 2021 15:22:43 +0200 Subject: [PATCH 05/24] Update dev-image.yml --- .github/workflows/dev-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev-image.yml b/.github/workflows/dev-image.yml index 031b54d..0099343 100644 --- a/.github/workflows/dev-image.yml +++ b/.github/workflows/dev-image.yml @@ -51,6 +51,6 @@ jobs: builder: ${{ steps.buildx.outputs.name }} context: . file: ./Dockerfile - platforms: linux/amd64,linux/arm64,linux/ppc64le + platforms: linux/amd64,linux/arm64, linux/arm/v7,linux/arm/v6 push: true tags: ${{ steps.prep.outputs.tags }} From 9d412e35ee15fc79a46199a113e2d6f15ddce319 Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Mon, 21 Jun 2021 16:07:24 +0200 Subject: [PATCH 06/24] Update dev-image.yml --- .github/workflows/dev-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/dev-image.yml b/.github/workflows/dev-image.yml index 0099343..1ea3898 100644 --- a/.github/workflows/dev-image.yml +++ b/.github/workflows/dev-image.yml @@ -51,6 +51,6 @@ jobs: builder: ${{ steps.buildx.outputs.name }} context: . file: ./Dockerfile - platforms: linux/amd64,linux/arm64, linux/arm/v7,linux/arm/v6 + platforms: linux/amd64,linux/arm64 push: true tags: ${{ steps.prep.outputs.tags }} From 1edf0d72ec6d30fa21525b14dfa86726fac51ec4 Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Mon, 21 Jun 2021 17:24:11 +0200 Subject: [PATCH 07/24] Update dev-image.yml --- .github/workflows/dev-image.yml | 85 ++++++++++++++++----------------- 1 file changed, 41 insertions(+), 44 deletions(-) diff --git a/.github/workflows/dev-image.yml b/.github/workflows/dev-image.yml index 1ea3898..c9ced7c 100644 --- a/.github/workflows/dev-image.yml +++ b/.github/workflows/dev-image.yml @@ -1,56 +1,53 @@ name: Docker Images CI on: push: - branches: [ dev ] + branches: dev + jobs: - docker: + buildx: runs-on: ubuntu-latest steps: - - name: Checkout + - + name: Checkout uses: actions/checkout@v2 - - - name: Prepare - id: prep - run: | - DOCKER_IMAGE=${{ secrets.DOCKER_USERNAME }}/${GITHUB_REPOSITORY#*/} - VERSION=latest - SHORTREF=${GITHUB_SHA::8} - - TAGS="${DOCKER_IMAGE}:dev,${DOCKER_IMAGE}:${SHORTREF}" - - # If the VERSION looks like a version number, assume that - # this is the most recent version of the image and also - # tag it 'latest'. - if [[ $VERSION =~ ^[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}$ ]]; then - TAGS="$TAGS,${DOCKER_IMAGE}:latest" - fi - - # Set output parameters. - echo ::set-output name=tags::${TAGS} - echo ::set-output name=docker_image::${DOCKER_IMAGE} - - - name: Set up QEMU - uses: docker/setup-qemu-action@master + - + name: Set up Docker Buildx + uses: crazy-max/ghaction-docker-buildx@v3 + - + name: Cache Docker layers + uses: actions/cache@v2 + id: cache with: - platforms: all - - - name: Set up Docker Buildx - id: buildx - uses: docker/setup-buildx-action@master - - - name: Login to DockerHub - if: github.event_name != 'pull_request' + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx- + - + name: Docker Buildx (build) + run: | + docker buildx build \ + --cache-from "type=local,src=/tmp/.buildx-cache" \ + --cache-to "type=local,dest=/tmp/.buildx-cache" \ + --platform linux/386,linux/amd64,linux/arm/v7,linux/arm64 \ + --output "type=image,push=false" \ + --tag albertoxamin/bang:dev \ + --file ./Dockerfile-diun ./ + - + name: Login to DockerHub uses: docker/login-action@v1 with: username: ${{ secrets.DOCKER_USERNAME }} password: ${{ secrets.DOCKER_PASSWORD }} - - - name: Build - uses: docker/build-push-action@v2 - with: - builder: ${{ steps.buildx.outputs.name }} - context: . - file: ./Dockerfile - platforms: linux/amd64,linux/arm64 - push: true - tags: ${{ steps.prep.outputs.tags }} + - + name: Docker Buildx (push) + run: | + docker buildx build \ + --cache-from "type=local,src=/tmp/.buildx-cache" \ + --platform linux/386,linux/amd64,linux/arm/v7,linux/arm64 \ + --output "type=image,push=true" \ + --tag albertoxamin/bang:dev \ + --file ./Dockerfile-diun ./ + - + name: Inspect image + run: | + docker buildx imagetools inspect albertoxamin/bang:dev From d730bb64dd792f0eaba2cf0f4d699598a17d872f Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Mon, 21 Jun 2021 17:25:27 +0200 Subject: [PATCH 08/24] Update dev-image.yml --- .github/workflows/dev-image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev-image.yml b/.github/workflows/dev-image.yml index c9ced7c..e448942 100644 --- a/.github/workflows/dev-image.yml +++ b/.github/workflows/dev-image.yml @@ -31,7 +31,7 @@ jobs: --platform linux/386,linux/amd64,linux/arm/v7,linux/arm64 \ --output "type=image,push=false" \ --tag albertoxamin/bang:dev \ - --file ./Dockerfile-diun ./ + --file ./Dockerfile ./ - name: Login to DockerHub uses: docker/login-action@v1 @@ -46,7 +46,7 @@ jobs: --platform linux/386,linux/amd64,linux/arm/v7,linux/arm64 \ --output "type=image,push=true" \ --tag albertoxamin/bang:dev \ - --file ./Dockerfile-diun ./ + --file ./Dockerfile ./ - name: Inspect image run: | From 242d1a8fc567345f703169891fecc02bb368dfd2 Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Mon, 21 Jun 2021 17:27:25 +0200 Subject: [PATCH 09/24] Update dev-image.yml --- .github/workflows/dev-image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev-image.yml b/.github/workflows/dev-image.yml index e448942..79edcf7 100644 --- a/.github/workflows/dev-image.yml +++ b/.github/workflows/dev-image.yml @@ -28,7 +28,7 @@ jobs: docker buildx build \ --cache-from "type=local,src=/tmp/.buildx-cache" \ --cache-to "type=local,dest=/tmp/.buildx-cache" \ - --platform linux/386,linux/amd64,linux/arm/v7,linux/arm64 \ + --platform linux/amd64,linux/arm/v7,linux/arm64 \ --output "type=image,push=false" \ --tag albertoxamin/bang:dev \ --file ./Dockerfile ./ @@ -43,7 +43,7 @@ jobs: run: | docker buildx build \ --cache-from "type=local,src=/tmp/.buildx-cache" \ - --platform linux/386,linux/amd64,linux/arm/v7,linux/arm64 \ + --platform linux/amd64,linux/arm/v7,linux/arm64 \ --output "type=image,push=true" \ --tag albertoxamin/bang:dev \ --file ./Dockerfile ./ From 06325154c901fe743700ee2efc708aa1f867306f Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Jun 2021 04:26:49 +0000 Subject: [PATCH 10/24] Bump vue-router from 3.5.1 to 3.5.2 in /frontend Bumps [vue-router](https://github.com/vuejs/vue-router) from 3.5.1 to 3.5.2. - [Release notes](https://github.com/vuejs/vue-router/releases) - [Changelog](https://github.com/vuejs/vue-router/blob/dev/CHANGELOG.md) - [Commits](https://github.com/vuejs/vue-router/compare/v3.5.1...v3.5.2) --- updated-dependencies: - dependency-name: vue-router dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- frontend/package.json | 2 +- frontend/yarn.lock | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/frontend/package.json b/frontend/package.json index 51ba188..102bcae 100644 --- a/frontend/package.json +++ b/frontend/package.json @@ -15,7 +15,7 @@ "vue": "^2.6.14", "vue-clipboard2": "^0.3.1", "vue-i18n": "^8.24.5", - "vue-router": "^3.5.1", + "vue-router": "^3.5.2", "vue-socket.io": "^3.0.10" }, "devDependencies": { diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 13fd21f..7e17e8c 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -8778,10 +8778,10 @@ vue-loader@^15.9.2: vue-hot-reload-api "^2.3.0" vue-style-loader "^4.1.0" -vue-router@^3.5.1: - version "3.5.1" - resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.5.1.tgz#edf3cf4907952d1e0583e079237220c5ff6eb6c9" - integrity sha512-RRQNLT8Mzr8z7eL4p7BtKvRaTSGdCbTy2+Mm5HTJvLGYSSeG9gDzNasJPP/yOYKLy+/cLG/ftrqq5fvkFwBJEw== +vue-router@^3.5.2: + version "3.5.2" + resolved "https://registry.yarnpkg.com/vue-router/-/vue-router-3.5.2.tgz#5f55e3f251970e36c3e8d88a7cd2d67a350ade5c" + integrity sha512-807gn82hTnjCYGrnF3eNmIw/dk7/GE4B5h69BlyCK9KHASwSloD1Sjcn06zg9fVG4fYH2DrsNBZkpLtb25WtaQ== vue-socket.io@^3.0.10: version "3.0.10" From 63b6437248280d2625cef3f8c20c2488e718d04e Mon Sep 17 00:00:00 2001 From: Alberto Date: Tue, 22 Jun 2021 10:03:37 +0200 Subject: [PATCH 11/24] add apt get install dependencies --- backend/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/backend/Dockerfile b/backend/Dockerfile index 515c7b6..df7d29e 100644 --- a/backend/Dockerfile +++ b/backend/Dockerfile @@ -2,6 +2,9 @@ FROM python:3.7-slim-stretch WORKDIR /code COPY * /code/ +RUN RUN apt-get update && apt-get install -y \ + libevent-dev \ + python-all-dev RUN pip install -r requirements.txt EXPOSE 5001 From 401fe96988deab04d494b573115482011b6900d6 Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Tue, 22 Jun 2021 10:06:54 +0200 Subject: [PATCH 12/24] Update dev-image.yml --- .github/workflows/dev-image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev-image.yml b/.github/workflows/dev-image.yml index 79edcf7..ea091e3 100644 --- a/.github/workflows/dev-image.yml +++ b/.github/workflows/dev-image.yml @@ -28,7 +28,7 @@ jobs: docker buildx build \ --cache-from "type=local,src=/tmp/.buildx-cache" \ --cache-to "type=local,dest=/tmp/.buildx-cache" \ - --platform linux/amd64,linux/arm/v7,linux/arm64 \ + --platform linux/amd64,linux/arm/v7 \ --output "type=image,push=false" \ --tag albertoxamin/bang:dev \ --file ./Dockerfile ./ @@ -43,7 +43,7 @@ jobs: run: | docker buildx build \ --cache-from "type=local,src=/tmp/.buildx-cache" \ - --platform linux/amd64,linux/arm/v7,linux/arm64 \ + --platform linux/amd64,linux/arm/v7 \ --output "type=image,push=true" \ --tag albertoxamin/bang:dev \ --file ./Dockerfile ./ From d35adf482ffd6a5c82761458988cbe4f9e5cad56 Mon Sep 17 00:00:00 2001 From: Alberto Date: Tue, 22 Jun 2021 10:13:26 +0200 Subject: [PATCH 13/24] push the right docker file --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index e63da3d..757e376 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,9 @@ FROM python:3.7-slim-stretch COPY --from=builder ./dist /dist/ COPY ./backend /dist/ WORKDIR /dist +RUN RUN apt-get update && apt-get install -y \ + libevent-dev \ + python-all-dev RUN pip install -r requirements.txt EXPOSE 5001 ENTRYPOINT ["python", "/dist/__init__.py"] \ No newline at end of file From a263fe83a93b635557787f2030a6c34f1c6c7676 Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Tue, 22 Jun 2021 10:16:53 +0200 Subject: [PATCH 14/24] Update dev-image.yml --- .github/workflows/dev-image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev-image.yml b/.github/workflows/dev-image.yml index ea091e3..2a5684b 100644 --- a/.github/workflows/dev-image.yml +++ b/.github/workflows/dev-image.yml @@ -28,7 +28,7 @@ jobs: docker buildx build \ --cache-from "type=local,src=/tmp/.buildx-cache" \ --cache-to "type=local,dest=/tmp/.buildx-cache" \ - --platform linux/amd64,linux/arm/v7 \ + --platform linux/arm/v7 \ --output "type=image,push=false" \ --tag albertoxamin/bang:dev \ --file ./Dockerfile ./ @@ -43,7 +43,7 @@ jobs: run: | docker buildx build \ --cache-from "type=local,src=/tmp/.buildx-cache" \ - --platform linux/amd64,linux/arm/v7 \ + --platform linux/arm/v7 \ --output "type=image,push=true" \ --tag albertoxamin/bang:dev \ --file ./Dockerfile ./ From c39e323fd0fd0c444c4f330d66b0f6a4985b4ce0 Mon Sep 17 00:00:00 2001 From: Alberto Date: Tue, 22 Jun 2021 10:24:02 +0200 Subject: [PATCH 15/24] test smaller dockerfile --- Dockerfile | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/Dockerfile b/Dockerfile index 757e376..0a58f1f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,12 +1,12 @@ -FROM node:lts-alpine as builder -COPY ./frontend . -RUN npm install -RUN npm run build +# FROM node:lts-alpine as builder +# COPY ./frontend . +# RUN npm install +# RUN npm run build FROM python:3.7-slim-stretch -COPY --from=builder ./dist /dist/ +# COPY --from=builder ./dist /dist/ COPY ./backend /dist/ WORKDIR /dist -RUN RUN apt-get update && apt-get install -y \ +RUN apt-get update && apt-get install -y \ libevent-dev \ python-all-dev RUN pip install -r requirements.txt From 5b6ac76d243126184964ecc7218c8b90a9e3e4a1 Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Tue, 22 Jun 2021 10:28:59 +0200 Subject: [PATCH 16/24] Update Dockerfile --- Dockerfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 0a58f1f..57737b4 100644 --- a/Dockerfile +++ b/Dockerfile @@ -8,7 +8,8 @@ COPY ./backend /dist/ WORKDIR /dist RUN apt-get update && apt-get install -y \ libevent-dev \ - python-all-dev + python-all-dev \ + gcc RUN pip install -r requirements.txt EXPOSE 5001 -ENTRYPOINT ["python", "/dist/__init__.py"] \ No newline at end of file +ENTRYPOINT ["python", "/dist/__init__.py"] From 63842fea2a8726f9e8f1fe6b94fd17b13cd519b5 Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Tue, 22 Jun 2021 10:32:18 +0200 Subject: [PATCH 17/24] Update Dockerfile --- Dockerfile | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index 57737b4..2fe67b8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,14 +2,10 @@ # COPY ./frontend . # RUN npm install # RUN npm run build -FROM python:3.7-slim-stretch +FROM python:3.7 # COPY --from=builder ./dist /dist/ COPY ./backend /dist/ WORKDIR /dist -RUN apt-get update && apt-get install -y \ - libevent-dev \ - python-all-dev \ - gcc RUN pip install -r requirements.txt EXPOSE 5001 ENTRYPOINT ["python", "/dist/__init__.py"] From 102dc3873e63156c792384755f1789a9a8031927 Mon Sep 17 00:00:00 2001 From: Alberto Date: Tue, 22 Jun 2021 10:35:45 +0200 Subject: [PATCH 18/24] add back other stuff --- .github/workflows/dev-image.yml | 4 ++-- Dockerfile | 10 +++++----- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/.github/workflows/dev-image.yml b/.github/workflows/dev-image.yml index 2a5684b..79edcf7 100644 --- a/.github/workflows/dev-image.yml +++ b/.github/workflows/dev-image.yml @@ -28,7 +28,7 @@ jobs: docker buildx build \ --cache-from "type=local,src=/tmp/.buildx-cache" \ --cache-to "type=local,dest=/tmp/.buildx-cache" \ - --platform linux/arm/v7 \ + --platform linux/amd64,linux/arm/v7,linux/arm64 \ --output "type=image,push=false" \ --tag albertoxamin/bang:dev \ --file ./Dockerfile ./ @@ -43,7 +43,7 @@ jobs: run: | docker buildx build \ --cache-from "type=local,src=/tmp/.buildx-cache" \ - --platform linux/arm/v7 \ + --platform linux/amd64,linux/arm/v7,linux/arm64 \ --output "type=image,push=true" \ --tag albertoxamin/bang:dev \ --file ./Dockerfile ./ diff --git a/Dockerfile b/Dockerfile index 2fe67b8..6e955f0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,9 +1,9 @@ -# FROM node:lts-alpine as builder -# COPY ./frontend . -# RUN npm install -# RUN npm run build +FROM node:lts-alpine as builder +COPY ./frontend . +RUN npm install +RUN npm run build FROM python:3.7 -# COPY --from=builder ./dist /dist/ +COPY --from=builder ./dist /dist/ COPY ./backend /dist/ WORKDIR /dist RUN pip install -r requirements.txt From f89ba2243548f056f6f584affe1716e81e891efd Mon Sep 17 00:00:00 2001 From: Alberto Date: Tue, 22 Jun 2021 11:01:21 +0200 Subject: [PATCH 19/24] update github action for main image --- .github/workflows/docker-image.yml | 58 ++++++++++++++++++++++++------ 1 file changed, 47 insertions(+), 11 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index cb13728..305bbe2 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,17 +1,53 @@ name: Docker Images CI on: push: - branches: [ main ] + branches: dev + jobs: - build: + buildx: runs-on: ubuntu-latest - env: - DOCKER_BUILDKIT: '1' steps: - - uses: actions/checkout@v2 - - name: Build the Unified Docker image - run: docker build . --file Dockerfile --tag albertoxamin/bang:latest - - name: Log into registry - run: echo "${{ secrets.DOCKER_PASSWORD }}" | docker login -u ${{ secrets.DOCKER_USERNAME }} --password-stdin - - name: Push images - run: docker push albertoxamin/bang:latest + - + name: Checkout + uses: actions/checkout@v2 + - + name: Set up Docker Buildx + uses: crazy-max/ghaction-docker-buildx@v3 + - + name: Cache Docker layers + uses: actions/cache@v2 + id: cache + with: + path: /tmp/.buildx-cache + key: ${{ runner.os }}-buildx-${{ github.sha }} + restore-keys: | + ${{ runner.os }}-buildx- + - + name: Docker Buildx (build) + run: | + docker buildx build \ + --cache-from "type=local,src=/tmp/.buildx-cache" \ + --cache-to "type=local,dest=/tmp/.buildx-cache" \ + --platform linux/amd64,linux/arm/v7,linux/arm64 \ + --output "type=image,push=false" \ + --tag albertoxamin/bang:latest \ + --file ./Dockerfile ./ + - + name: Login to DockerHub + uses: docker/login-action@v1 + with: + username: ${{ secrets.DOCKER_USERNAME }} + password: ${{ secrets.DOCKER_PASSWORD }} + - + name: Docker Buildx (push) + run: | + docker buildx build \ + --cache-from "type=local,src=/tmp/.buildx-cache" \ + --platform linux/amd64,linux/arm/v7,linux/arm64 \ + --output "type=image,push=true" \ + --tag albertoxamin/bang:latest \ + --file ./Dockerfile ./ + - + name: Inspect image + run: | + docker buildx imagetools inspect albertoxamin/bang:latest From 8193e81148b2a8d45c68537aa8ced485fe1c294b Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 22 Jun 2021 09:03:01 +0000 Subject: [PATCH 20/24] Bump color-string from 1.5.4 to 1.5.5 in /frontend Bumps [color-string](https://github.com/Qix-/color-string) from 1.5.4 to 1.5.5. - [Release notes](https://github.com/Qix-/color-string/releases) - [Changelog](https://github.com/Qix-/color-string/blob/master/CHANGELOG.md) - [Commits](https://github.com/Qix-/color-string/compare/1.5.4...1.5.5) --- updated-dependencies: - dependency-name: color-string dependency-type: indirect ... Signed-off-by: dependabot[bot] --- frontend/yarn.lock | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/frontend/yarn.lock b/frontend/yarn.lock index 7e17e8c..0259ada 100644 --- a/frontend/yarn.lock +++ b/frontend/yarn.lock @@ -2728,9 +2728,9 @@ color-name@^1.0.0, color-name@~1.1.4: integrity sha1-wqCah6y95pVD3m9j+jmVyCbFNqI= color-string@^1.5.4: - version "1.5.4" - resolved "https://registry.npm.taobao.org/color-string/download/color-string-1.5.4.tgz?cache=0&sync_timestamp=1602228027609&other_urls=https%3A%2F%2Fregistry.npm.taobao.org%2Fcolor-string%2Fdownload%2Fcolor-string-1.5.4.tgz#dd51cd25cfee953d138fe4002372cc3d0e504cb6" - integrity sha1-3VHNJc/ulT0Tj+QAI3LMPQ5QTLY= + version "1.5.5" + resolved "https://registry.yarnpkg.com/color-string/-/color-string-1.5.5.tgz#65474a8f0e7439625f3d27a6a19d89fc45223014" + integrity sha512-jgIoum0OfQfq9Whcfc2z/VhCNcmQjWbey6qBX0vqt7YICflUmBCh9E9CiQD5GSJ+Uehixm3NUwHVhqUAWRivZg== dependencies: color-name "^1.0.0" simple-swizzle "^0.2.2" @@ -5012,8 +5012,8 @@ is-arrayish@^0.2.1: is-arrayish@^0.3.1: version "0.3.2" - resolved "https://registry.npm.taobao.org/is-arrayish/download/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" - integrity sha1-RXSirlb3qyBolvtDHq7tBm/fjwM= + resolved "https://registry.yarnpkg.com/is-arrayish/-/is-arrayish-0.3.2.tgz#4574a2ae56f7ab206896fb431eaeed066fdf8f03" + integrity sha512-eVRqCvVlZbuw3GrM63ovNSNAeA1K16kaR/LRY/92w0zxQ5/1YzwblUX652i4Xs9RwAGjW9d9y6X88t8OaAJfWQ== is-binary-path@^1.0.0: version "1.0.1" @@ -7685,7 +7685,7 @@ signal-exit@^3.0.0, signal-exit@^3.0.2: simple-swizzle@^0.2.2: version "0.2.2" - resolved "https://registry.npm.taobao.org/simple-swizzle/download/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" + resolved "https://registry.yarnpkg.com/simple-swizzle/-/simple-swizzle-0.2.2.tgz#a4da6b635ffcccca33f70d17cb92592de95e557a" integrity sha1-pNprY1/8zMoz9w0Xy5JZLeleVXo= dependencies: is-arrayish "^0.3.1" From 8d839f1d5771a852081be4cd3dc5e2e3ed54fb86 Mon Sep 17 00:00:00 2001 From: Alberto Date: Tue, 22 Jun 2021 15:04:12 +0200 Subject: [PATCH 21/24] update base docker image --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 6e955f0..06a1600 100644 --- a/Dockerfile +++ b/Dockerfile @@ -2,7 +2,7 @@ FROM node:lts-alpine as builder COPY ./frontend . RUN npm install RUN npm run build -FROM python:3.7 +FROM python:3.7.10-stretch COPY --from=builder ./dist /dist/ COPY ./backend /dist/ WORKDIR /dist From 1f82ed83242f7a2ce11e68782a84f7e4b05b8a08 Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Tue, 22 Jun 2021 15:06:43 +0200 Subject: [PATCH 22/24] Update docker-image.yml --- .github/workflows/docker-image.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index 305bbe2..f77cbe7 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -1,7 +1,7 @@ name: Docker Images CI on: push: - branches: dev + branches: main jobs: buildx: From 14919ae47672ef090e4e848ddb30aad02792400b Mon Sep 17 00:00:00 2001 From: Alberto Xamin Date: Tue, 22 Jun 2021 15:08:29 +0200 Subject: [PATCH 23/24] Update docker-image.yml --- .github/workflows/docker-image.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/docker-image.yml b/.github/workflows/docker-image.yml index f77cbe7..8c53638 100644 --- a/.github/workflows/docker-image.yml +++ b/.github/workflows/docker-image.yml @@ -28,7 +28,7 @@ jobs: docker buildx build \ --cache-from "type=local,src=/tmp/.buildx-cache" \ --cache-to "type=local,dest=/tmp/.buildx-cache" \ - --platform linux/amd64,linux/arm/v7,linux/arm64 \ + --platform linux/amd64,linux/arm/v7 \ --output "type=image,push=false" \ --tag albertoxamin/bang:latest \ --file ./Dockerfile ./ @@ -43,7 +43,7 @@ jobs: run: | docker buildx build \ --cache-from "type=local,src=/tmp/.buildx-cache" \ - --platform linux/amd64,linux/arm/v7,linux/arm64 \ + --platform linux/amd64,linux/arm/v7 \ --output "type=image,push=true" \ --tag albertoxamin/bang:latest \ --file ./Dockerfile ./ From 33b0158558db50befee97e0ff9941f2e5d65f05d Mon Sep 17 00:00:00 2001 From: Giulio Date: Tue, 22 Jun 2021 16:03:41 +0200 Subject: [PATCH 24/24] fix starting error --- frontend/src/components/Player.vue | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/frontend/src/components/Player.vue b/frontend/src/components/Player.vue index a31fce1..15c13df 100644 --- a/frontend/src/components/Player.vue +++ b/frontend/src/components/Player.vue @@ -136,7 +136,9 @@ export default { this.name = self.name this.pending_action = self.pending_action this.character = self.character - this.character.is_character = true + if (this.character != null) { + this.character.is_character = true + } this.hand = self.hand this.equipment = self.equipment this.lives = self.lives