Compare commits

..

38 Commits

Author SHA1 Message Date
Alf Sebastian Houge 6e59156c24 Merge pull request #77 from AlfHou/AlfHou-patch-1
Remove commit linters from package.json
2023-07-21 15:41:27 +02:00
Alf Sebastian Houge d786e1ad08 Remove commit linters from package.json
Remove these commit linters as they are giving us problems with the docker build. Might reintroduce once we get the dependencies more up to date
2023-07-21 15:41:15 +02:00
Alf Sebastian Houge bb0dc22630 Merge pull request #76 from AlfHou/AlfHou-patch-1
Update Dockerfile
2023-07-21 14:19:41 +02:00
Alf Sebastian Houge d81701c4fa Update Dockerfile 2023-07-21 14:19:31 +02:00
Alf Sebastian Houge c4f5d93b8b Merge pull request #75 from AlfHou/AlfHou-patch-1
Update Dockerfile
2023-07-21 13:14:20 +02:00
Alf Sebastian Houge 6132aa36af Update Dockerfile 2023-07-21 13:13:57 +02:00
Alf Sebastian Houge 49cc485866 Merge pull request #74 from AlfHou/AlfHou-patch-1
Update Dockerfile
2023-07-20 14:39:20 +02:00
Alf Sebastian Houge 4ed813cd2e Update Dockerfile 2023-07-20 14:39:11 +02:00
Alf Sebastian Houge 9bcc2cc2a0 Merge pull request #73 from AlfHou/AlfHou-patch-1
Update Dockerfile
2023-07-20 14:05:20 +02:00
Alf Sebastian Houge d3d8cc268d Update Dockerfile 2023-07-20 14:05:07 +02:00
Alf Sebastian Houge 62dcf663ff Merge pull request #72 from AlfHou/AlfHou-patch-1
Update Dockerfile
2023-07-20 13:23:48 +02:00
Alf Sebastian Houge b016dadb9d Update Dockerfile 2023-07-20 13:23:38 +02:00
Alf Sebastian Houge b962565ed6 Merge pull request #71 from AlfHou/AlfHou-patch-1
Update Dockerfile
2023-07-20 13:13:27 +02:00
Alf Sebastian Houge 20b0e246fd Update Dockerfile 2023-07-20 13:13:11 +02:00
Alf Sebastian Houge f1a7a053f4 Merge pull request #70 from AlfHou/AlfHou-patch-1
Update Dockerfile
2023-07-20 12:59:11 +02:00
Alf Sebastian Houge 359f35c53f Update Dockerfile 2023-07-20 12:59:01 +02:00
Alf Sebastian Houge ea3423d32a Merge pull request #69 from AlfHou/AlfHou-patch-1
Update Dockerfile
2023-07-20 12:14:16 +02:00
Alf Sebastian Houge 6542a3bb28 Update Dockerfile 2023-07-20 12:14:05 +02:00
Alf Sebastian Houge 35d2f1ca0b Merge pull request #68 from AlfHou/AlfHou-patch-1 2023-07-20 01:15:31 +02:00
Alf Sebastian Houge 565d5701be Update Dockerfile to use Debian instead of alpine 2023-07-20 01:15:09 +02:00
Alf Sebastian Houge 2eb78ab73c Merge pull request #67 from AlfHou/AlfHou-patch-1
Update Dockerfile
2023-07-20 00:57:24 +02:00
Alf Sebastian Houge edf4647549 Update Dockerfile 2023-07-20 00:57:15 +02:00
Alf Sebastian Houge e87a348b90 Merge pull request #66 from AlfHou/AlfHou-patch-1
Add autoconf dependency to dockerfile
2023-07-20 00:48:13 +02:00
Alf Sebastian Houge c15b22c71a Update Dockerfile 2023-07-20 00:47:52 +02:00
Alf Sebastian Houge 1c9f9c7803 Merge pull request #65 from AlfHou/AlfHou-patch-1
Update hub.yml
2023-07-20 00:40:23 +02:00
Alf Sebastian Houge 89bdfdefd4 Update hub.yml 2023-07-20 00:40:13 +02:00
Alf Sebastian Houge 2974fd783f Merge pull request #64 from AlfHou/AlfHou-patch-1
Fix typo in hub.yml
2023-07-20 00:37:42 +02:00
Alf Sebastian Houge bd22b5a497 Fix typo in hub.yml 2023-07-20 00:36:08 +02:00
Alf Sebastian Houge 8f6408a92b Merge pull request #63 from AlfHou/AlfHou-patch-1
Update github workflow for publishing releases
2023-07-20 00:30:13 +02:00
Alf Sebastian Houge 20bc28fffa Update workflow for publishing releases 2023-07-20 00:28:44 +02:00
Alf Sebastian Houge 3c89e75a34 Merge pull request #62 from AlfHou/AlfHou-patch-2
Update Dockerfile
2023-07-19 23:27:46 +02:00
Alf Sebastian Houge 5594356166 Update Dockerfile 2023-07-19 23:25:20 +02:00
Alf Sebastian Houge cea08a59be Merge pull request #61 from AlfHou/AlfHou-patch-2
Update Dockerfile
2023-07-19 23:23:22 +02:00
Alf Sebastian Houge f16ed1a39f Update Dockerfile 2023-07-19 23:23:03 +02:00
Alf Sebastian Houge 66032fcf55 Merge pull request #60 from AlfHou/AlfHou-patch-2
Update Dockerfile
2023-07-19 15:46:55 +02:00
Alf Sebastian Houge 34a9d56726 Update Dockerfile 2023-07-19 15:45:30 +02:00
Alf Sebastian Houge a0880ad5b6 Merge pull request #58 from AlfHou/AlfHou-patch-2
Update go and npm version in Dockerfile
2023-07-19 11:24:11 +02:00
Alf Sebastian Houge 17e8e5914e Update go and npm version in Dockerfile 2023-07-19 11:19:15 +02:00
3 changed files with 8 additions and 17 deletions
+4 -13
View File
@@ -12,25 +12,18 @@ jobs:
uses: actions/checkout@v2
- name: Set up QEMU
id: qemu
uses: docker/setup-qemu-action@v1
uses: docker/setup-qemu-action@v2
with:
platforms: linux/amd64,linux/arm64,linux/arm/v7
- name: Available platforms
run: echo ${{ steps.qemu.outputs.platforms }}
- name: Set up Docker Buildx
uses: docker/setup-buildx-action@v1
- name: Set up build cache
uses: actions/cache@v2
with:
path: /tmp/.buildx-cache
key: ${{ runner.os }}-buildx-${{ github.sha }}
restore-keys: |
${{ runner.os }}-buildx-
uses: docker/setup-buildx-action@v2
- name: Parse the git tag
id: get_tag
run: echo ::set-output name=TAG::$(echo $GITHUB_REF | cut -d / -f 3)
- name: Login to DockerHub
uses: docker/login-action@v1
uses: docker/login-action@v2
with:
username: ${{ secrets.DOCKER_USERNAME }}
password: ${{ secrets.DOCKER_TOKEN }}
@@ -41,12 +34,10 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GITHUB_TOKEN }}
- name: Build and push
uses: docker/build-push-action@v2
uses: docker/build-push-action@v4
with:
context: .
file: ./Dockerfile
#platforms: linux/amd64,linux/arm/v6,linux/arm/v7,linux/arm64
#platforms: linux/amd64,linux/arm64,linux/arm/v6,linux/arm/v7
platforms: linux/amd64,linux/arm64,linux/arm/v7
push: true
# cache-from: type=local,src=/tmp/.buildx-cache
+4 -2
View File
@@ -1,4 +1,4 @@
ARG GO_VERSION=1.16.2
ARG GO_VERSION=1.20.6
FROM golang:${GO_VERSION}-alpine AS builder
RUN apk update && apk add alpine-sdk git && rm -rf /var/cache/apk/*
RUN mkdir -p /api
@@ -9,9 +9,11 @@ RUN go mod download
COPY ./server .
RUN go build -o ./app ./main.go
FROM node:14 as build-stage
FROM node:18-alpine as build-stage
WORKDIR /app
COPY ./ui/package*.json ./
RUN apk add --no-cache autoconf automake build-base nasm libc6-compat python3 py3-pip make g++ libpng-dev zlib-dev pngquant
RUN npm install
COPY ./ui .
RUN npm run build
-2
View File
@@ -63,8 +63,6 @@
"eslint-plugin-vue": "^9.9.0",
"express": "^4.18.2",
"hygen": "^6.2.11",
"imagemin-lint-staged": "^0.5.1",
"lint-staged": "^13.1.1",
"markdownlint-cli": "^0.33.0",
"npm-run-all": "^4.1.1",
"sass": "^1.58.0",