From d78d6411c9dbc1138a0dc9b80e462aa502a1b6d6 Mon Sep 17 00:00:00 2001 From: Phil Date: Tue, 25 Jan 2022 08:20:01 +0100 Subject: [PATCH] Fixed CI Layout --- .gitlab-ci.yml | 13 +++++++------ README.md | 21 +++++++++++++++++---- 2 files changed, 24 insertions(+), 10 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5c9b455..9f5ee89 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -35,7 +35,7 @@ check-gosec: - merge_requests release-prod-linux-amd64: - image: golang:alpine + image: golang:latest stage: build-binary variables: GOOS: "linux" @@ -54,7 +54,7 @@ release-prod-linux-amd64: - branches release-prod-linux-arm64: - image: golang:alpine + image: golang:latest stage: build-binary variables: GOOS: "linux" @@ -73,7 +73,7 @@ release-prod-linux-arm64: - branches release-prod-darwin-amd64: - image: golang:alpine + image: golang:latest stage: build-binary variables: GOOS: "darwin" @@ -92,7 +92,7 @@ release-prod-darwin-amd64: - branches release-prod-darwin-arm64: - image: golang:alpine + image: golang:latest stage: build-binary variables: GOOS: "darwin" @@ -111,7 +111,7 @@ release-prod-darwin-arm64: - branches release-prod-windows-amd64: - image: golang:alpine + image: golang:latest stage: build-binary variables: GOOS: "windows" @@ -161,7 +161,8 @@ docker-build-prod-tagged: script: - | docker buildx build \ - --platform linux/amd64,linux/arm64,linux/arm/v7,linux/arm/v6 \ + --platform linux/amd64,linux/arm64 \ + --no-cache \ --build-arg CI_COMMIT_BRANCH=$CI_COMMIT_BRANCH \ --build-arg CI_COMMIT_SHORT_SHA=$CI_COMMIT_SHORT_SHA \ --build-arg CI_COMMIT_TAG=$CI_COMMIT_TAG \ diff --git a/README.md b/README.md index bef8d5b..1ebca30 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,19 @@ ![](https://git.ucode.space/Phil/goshorly/badges/main/pipeline.svg) # goshorly -An easy self-hosted Link shortener in Golang with Redis <3 - -[Live-Demo](https://gly.one) | Stable Build - +An easy self-hosted Link shortener in Golang with Redis <3 [Live-Demo](https://gly.one) +--- +## Supported architectures +### Docker +- amd64, arm64 +- other versions can be build manually (via docker build) +## Binary Build +- linux (amd64,arm64) +- darwin (amd64,arm64) +- windows (amd64) +- other versions can be build manually (via go build) +--- **WARNING:** - goshorly is in an early stage, it is not an Final Version! (Pre-Release Status v0.1.X) @@ -14,6 +22,8 @@ If you have an feature request, please do not hesitate to open an issue or merge Available Docker tags: - https://git.ucode.space/Phil/goshorly/container_registry/1 + +## Install with Docker Installation with Docker-Compose (with no reverse proxy / own proxy): ```bash mkdir goshorly @@ -32,3 +42,6 @@ mv docker-compose-proxy.yml docker-compose.yml nano docker-compose.yml # Change the command line on caddy to your domain & environment variables to your needs docker-compose up -d ``` + +## Install with Binary version +- WIP \ No newline at end of file