Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: add arm docker support #938

Closed
wants to merge 2 commits into from
Closed

feat: add arm docker support #938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1793d8e
fix : shell > redirect error
WarlockFish Jul 31, 2022
49fd8e9
feat: add arm docker
WarlockFish Jul 31, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
12 changes: 10 additions & 2 deletions .github/workflows/build.yml
View file
Open in desktop
Expand Up @@ -102,6 +102,12 @@ jobs:

fi

- name: Set up QEMU
uses: docker/setup-qemu-action@v2

- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v2

- name: Log in to Docker Hub
uses: docker/login-action@v1
if: github.repository == 'casdoor/casdoor' && github.event_name == 'push' &&steps.should_push.outputs.push=='true'
Expand All @@ -111,17 +117,19 @@ jobs:


- name: Push to Docker Hub
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
if: github.repository == 'casdoor/casdoor' && github.event_name == 'push' && steps.should_push.outputs.push=='true'
with:
target: STANDARD
push: true
platforms: linux/amd64,linux/arm64,linux/arm/v7
tags: casbin/casdoor:${{steps.get-current-tag.outputs.tag }},casbin/casdoor:latest

- name: Push All In One Version to Docker Hub
uses: docker/build-push-action@v2
uses: docker/build-push-action@v3
if: github.repository == 'casdoor/casdoor' && github.event_name == 'push' && steps.should_push.outputs.push=='true'
with:
target: ALLINONE
push: true
platforms: linux/amd64,linux/arm64,linux/arm/v7
tags: casbin/casdoor-all-in-one:${{steps.get-current-tag.outputs.tag }},casbin/casdoor-all-in-one:latest
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Expand Up @@ -2,7 +2,7 @@ FROM node:16.13.0 AS FRONT
WORKDIR /web
COPY ./web .
RUN yarn config set registry https://registry.npmmirror.com
RUN yarn install && yarn run build
RUN yarn install --network-timeout 200000 && yarn run build


FROM golang:1.17.5 AS BACK
Expand Down
2 changes: 1 addition & 1 deletion build.sh
View file
Open in desktop
@@ -1,6 +1,6 @@
#!/bin/bash
#try to connect to google to determine whether user need to use proxy
curl www.google.com -o /dev/null --connect-timeout 5 2 > /dev/null
curl google.com -o /dev/null --connect-timeout 5 2>/dev/null
if [ $? == 0 ]
then
echo "Successfully connected to Google, no need to use Go proxy"
Expand Down