Skip to content

Commit

Permalink
Merge pull request #29 from Zibbp/develop
Browse files Browse the repository at this point in the history
Support for multi-architect builds
  • Loading branch information
Zibbp committed Oct 21, 2020
2 parents 85ae92f + d9de6a6 commit 7f7b6c7
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 15 deletions.
29 changes: 19 additions & 10 deletions .github/workflows/deploy.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,8 @@ jobs:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v2
- name: Build the Docker image
run: docker build . --file Dockerfile --tag my-image-name:$(date +%s)
- name: Checkout
uses: actions/checkout@v2
- name: "Automated Version Bump"
uses: "phips28/gh-action-bump-version@master"
with:
Expand All @@ -24,16 +23,26 @@ jobs:
- name: Read package.json
uses: tyankatsu0105/read-package-version-actions@v1
id: package-version
- name: Publish to Docker Hub
uses: elgohr/Publish-Docker-Github-Action@master
- name: Set up QEMU
uses: docker/setup-qemu-action@v1
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Login to DockerHub
uses: docker/login-action@v1
with:
name: zibbp/radium
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_PASSWORD }}
dockerfile: ./Dockerfile
context: "."
tags: "latest,${{ steps.package-version.outputs.version }}"
- name: Commit bumped version
- name: Build and push
uses: docker/build-push-action@v2
with:
context: .
file: ./Dockerfile
platforms: linux/amd64,linux/arm64,linux/arm/v7
push: true
tags: |
zibbp/radium:latest
zibbp/radium:${{ steps.package-version.outputs.version }}
- name: Bump version
uses: stefanzweifel/[email protected]
with:
commit_message: "Updated version to ${{ steps.bump_version.outputs.next-version }}"
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
FROM mhart/alpine-node:12
FROM node:12.19.0-alpine3.12

# create destination directory
WORKDIR /opt/app
Expand Down
11 changes: 7 additions & 4 deletions components/Login.vue
Original file line number Diff line number Diff line change
Expand Up @@ -97,10 +97,13 @@ export default {
if (this.username == "" || this.password == "") {
} else {
try {
var res = await this.$axios.post(`${this.$config.API_URL}/login`, {
username: this.username,
password: this.password,
});
var res = await this.$axios.post(
`${this.$config.API_URL}/api/v1/auth/login`,
{
username: this.username,
password: this.password,
}
);
// TODO: GET AND SET TOKEN / USERNAME
this.$store.commit("setToken", res.data.token);
Expand Down

0 comments on commit 7f7b6c7

Please sign in to comment.