From 8557857bb99bc9406a8fb6aeda8d26e50b18631c Mon Sep 17 00:00:00 2001
From: Martin Weise <martin.weise@tuwien.ac.at>
Date: Sun, 18 Jun 2023 17:01:58 +0200
Subject: [PATCH] Renamed targets
---
.gitlab-ci.yml | 20 ++++++--------------
Makefile | 13 ++++---------
2 files changed, 10 insertions(+), 23 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d97a8a8..1d8b9d2 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,38 +3,30 @@ cache:
- ./site
stages:
- - configure
- build
- deploy
-configure-certs:
- stage: configure
- script:
- - make configure
-
-build-mkdocs:
+build-docs:
stage: build
- needs:
- - configure-certs
script:
- - make build
+ - make build-docs
deploy-docs:
stage: deploy
needs:
- - build-mkdocs
+ - build-docs
only:
refs:
- master
script:
- - make deploy
+ - make deploy-docs
deploy-dockerhub-docs:
stage: deploy
needs:
- - build-mkdocs
+ - build-docs
only:
refs:
- master
script:
- - DOCKER_USERNAME="${DOCKER_USERNAME}" DOCKER_PASSWORD="${DOCKER_PASSWORD}" make docs
+ - DOCKER_USERNAME="${DOCKER_USERNAME}" DOCKER_PASSWORD="${DOCKER_PASSWORD}" make deploy deploy-dockerhub-docs
diff --git a/Makefile b/Makefile
index 780f556..e22a95d 100644
--- a/Makefile
+++ b/Makefile
@@ -2,31 +2,26 @@
TAG ?= latest
-all: build
+all: build-docs
clean:
rm -rf ./site
-release: release-dockerhub
-
-release-dockerhub:
+deploy-dockerhub-docs:
sudo pip3 install -r ./requirements.txt
python3 ./dockerhub/release.py
verify:
sudo nginx -t
-build:
+build-docs:
mkdocs build
cd ./swagger && bash ./generate.sh
build-swagger:
cd ./swagger && UPDATE=1 ./generate.sh
-configure:
- sudo certbot certonly --standalone --preferred-challenges http -d dbrepo-docs.ossdip.at --agree-tos --keep-until-expiring
-
-deploy: build
+deploy-docs: build-docs
tar czfv ./site.tar.gz ./site
scp ./site.tar.gz ec-thoas2:site.tar.gz
ssh ec-thoas2 "rm -rf /system/user/ifs/infrastructures/public_html/dbrepo/*; tar xzfv ./site.tar.gz; rm -f ./site.tar.gz; cp -r ./site/* /system/user/ifs/infrastructures/public_html/dbrepo; rm -rf ./site"
--
GitLab