Merge pull request #1129 from slntopp/dev

dev
slntopp · Sep 21, 2023 · 2c685ca · 2c685ca
2 parents 769f801 + 1dfcd81
commit 2c685ca
Show file tree

Hide file tree

Showing 57 changed files with 2,669 additions and 915 deletions.
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
@@ -23,7 +23,7 @@ jobs:
         with:
           fetch-depth: 1
       - name: Setup Go
-        uses: WillAbides/setup-go-faster@v1.10.1
+        uses: WillAbides/setup-go-faster@v1.11.0
         with:
           go-version: 1.19
       - name: Static Check

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -70,20 +70,20 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4.6.0
+        uses: docker/metadata-action@v5.0.0
         with:
           tags: type=raw,value=${{env.IMAGE_TAG}}
           images: ${{ env.REGISTRY }}/slntopp/nocloud/base
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v2.2.0
+        uses: docker/login-action@v3.0.0
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v4.2.1
+        uses: docker/build-push-action@v5.0.0
         with:
           context: .
           file: Dockerfile
@@ -107,20 +107,20 @@ jobs:
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4.6.0
+        uses: docker/metadata-action@v5.0.0
         with:
           tags: type=raw,value=${{env.IMAGE_TAG}}
           images: ${{ env.REGISTRY }}/slntopp/nocloud/${{matrix.tag}}
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v2.2.0
+        uses: docker/login-action@v3.0.0
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v4.2.1
+        uses: docker/build-push-action@v5.0.0
         id: build
         with:
           context: .

diff --git a/Dockerfiles/oauth2/Dockerfile b/Dockerfiles/oauth2/Dockerfile
@@ -0,0 +1,23 @@
+ARG IMAGE_TAG=latest
+ARG ARCH=amd64
+FROM ghcr.io/slntopp/nocloud/base:${IMAGE_TAG} as builder
+
+RUN CGO_ENABLED=0 GOARCH=${ARCH} go build -ldflags="-s -w" -buildvcs=false ./cmd/oauth2
+RUN upx ./oauth2
+
+RUN adduser -SD nocloud
+
+FROM scratch
+WORKDIR /
+COPY --from=builder  /go/src/github.com/slntopp/nocloud/oauth2 /oauth2
+COPY --from=builder /etc/ssl/certs/ca-certificates.crt /etc/ssl/certs/
+COPY --from=builder /etc/passwd /etc/passwd
+
+HEALTHCHECK NONE
+
+USER nocloud
+EXPOSE 8000
+LABEL org.opencontainers.image.source https://github.com/slntopp/nocloud
+LABEL nocloud.update "true"
+
+ENTRYPOINT ["/oauth2"]
diff --git a/admin-ui/package.json b/admin-ui/package.json
@@ -8,7 +8,8 @@
     "lint": "vue-cli-service lint"
   },
   "dependencies": {
-    "@ant-design/icons-vue": "^4.0.6",
+    "@ant-design/icons": "^2.0.0",
+    "@ant-design/icons-vue": "^2.0.0",
     "@sardinefish/asn1": "^1.0.4",
     "ansi-regex": "^6.0.1",
     "apexcharts": "^3.41.1",