From 2ac14e6f8eca00de492806bfeda51a6a8541de0e Mon Sep 17 00:00:00 2001 From: Jan-Lukas Else Date: Fri, 24 Dec 2021 13:23:45 +0100 Subject: [PATCH] Use GitHub Container Registry (Scaleway seems to be unreliable) --- .drone.yml | 8 ++++---- docs/build.md | 6 +++--- docs/install.md | 4 ++-- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.drone.yml b/.drone.yml index aac4286..fc27fd0 100644 --- a/.drone.yml +++ b/.drone.yml @@ -13,10 +13,10 @@ steps: from_secret: docker_password commands: - sleep 5 # give docker enough time to start - - echo $DOCKER_PASSWORD | docker login --username nologin --password-stdin rg.fr-par.scw.cloud/jlelse - - DOCKER_BUILDKIT=1 docker build -t rg.fr-par.scw.cloud/jlelse/goblog:latest . --target base - - DOCKER_BUILDKIT=1 docker build -t rg.fr-par.scw.cloud/jlelse/goblog:tools . --target tools - - docker push --all-tags rg.fr-par.scw.cloud/jlelse/goblog + - echo $DOCKER_PASSWORD | docker login --username jlelse --password-stdin ghcr.io + - DOCKER_BUILDKIT=1 docker build -t ghcr.io/jlelse/goblog:latest . --target base + - DOCKER_BUILDKIT=1 docker build -t ghcr.io/jlelse/goblog:tools . --target tools + - docker push --all-tags ghcr.io/jlelse/goblog services: - name: docker diff --git a/docs/build.md b/docs/build.md index 6975f62..ba98b61 100644 --- a/docs/build.md +++ b/docs/build.md @@ -4,7 +4,7 @@ There are two ways to build GoBlog: ## With Docker -(There are already pre-built images available at `rg.fr-par.scw.cloud/jlelse/goblog:latest` and `rg.fr-par.scw.cloud/jlelse/goblog:tools`) +(There are already pre-built images available at `ghcr.io/jlelse/goblog:latest` and `ghcr.io/jlelse/goblog:tools`) - Linux - git @@ -15,13 +15,13 @@ Build command: ```bash git clone https://git.jlel.se/jlelse/GoBlog.git cd GoBlog -docker build -t rg.fr-par.scw.cloud/jlelse/goblog:latest . --target base +docker build -t ghcr.io/jlelse/goblog:latest . --target base ``` If you want to build and use the advanced image (with additional tools), execute: ```bash -docker build -t rg.fr-par.scw.cloud/jlelse/goblog:tools . --target tools +docker build -t ghcr.io/jlelse/goblog:tools . --target tools ``` ## With Go installed diff --git a/docs/install.md b/docs/install.md index 1295b4c..269086e 100644 --- a/docs/install.md +++ b/docs/install.md @@ -1,6 +1,6 @@ # How to install and run GoBlog -It's recommended to install GoBlog using Docker (Compose). You can simply pull the latest image from `rg.fr-par.scw.cloud/jlelse/goblog:latest` (basic image) or `rg.fr-par.scw.cloud/jlelse/goblog:tools` (for when you want to use `sqlite3`, `bash` or `curl` in hook commands) when there are updates. Those images are tested and contain all necessary libraries and tools. +It's recommended to install GoBlog using Docker (Compose). You can simply pull the latest image from `ghcr.io/jlelse/goblog:latest` (basic image) or `ghcr.io/jlelse/goblog:tools` (for when you want to use `sqlite3`, `bash` or `curl` in hook commands) when there are updates. Those images are tested and contain all necessary libraries and tools. Create your config file (`./config/config.yml`) with inspiration from `example-config.yml` and create a new data directory (`./data`). For static files, you can also create a directory at `./static`. @@ -11,7 +11,7 @@ version: "3" services: goblog: container_name: goblog - image: rg.fr-par.scw.cloud/jlelse/goblog:latest # or :tools + image: ghcr.io/jlelse/goblog:latest # or :tools restart: unless-stopped # auto restart the container volumes: - ./config:/app/config # Config directory