Merge pull request 'separate-database' (#2) from separate-database into master

Reviewed-on: #2

.drone/build.sh

@@ -2,4 +2,4 @@ sleep 10
 
 docker build gitea \
   --build-arg REGISTRY=${REGISTRY_DOMAIN}:${REGISTRY_PORT}/${ROOT}/${NAME}/ \
-  -t ${REGISTRY_DOMAIN}:${REGISTRY_PORT}/${ROOT}/${NAME}/gitea
+  -t ${REGISTRY_DOMAIN}:${REGISTRY_PORT}/${ROOT}/${NAME}/gitea:$1

.drone/deploy.sh

@@ -1,4 +1,6 @@
 export LOCAL_DOCKER_REGISTRY=${REGISTRY_DOMAIN}:${REGISTRY_PORT}/${ROOT}/${NAME}/ \
+&& echo $1 \
+&& export TAG=$1 \
 && docker stack rm gitea \
 && echo 'sleeping...zzz' \
 && sleep 60 \

.drone/drone-home.yml

@@ -228,8 +228,8 @@ steps:
   - export NAME=gitea
   - export ROOT=stack
   - "n=0\nwhile :\ndo\n  docker login $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/ --username client --password \"$${REGISTRY_PASSWORD}\" \\\\\n    && break  # substitute your command here\n  n=$((n+1))\n      if [ $n -ge 10 ]; then\n      echo \"login failed\"\n      exit 1\n  fi\n  echo \"retrying login..$n\"\n  sleep 5\ndone\n"
-  - sh .drone/build.sh
+  - sh .drone/build.sh ${DRONE_COMMIT_SHA}
-  - sh .drone/push.sh
+  - sh .drone/push.sh ${DRONE_COMMIT_SHA}
   volumes:
   - name: dockersock
     path: /var/run
@@ -257,16 +257,21 @@ volumes:
     path: /etc/docker/daemon.json
 
 trigger:
-  event:
+  branch:
-  - promote
+    - separate-database
-  target:
+  #event:
-  - build
+  #- promote
+  #target:
+  #- build
 
 ---
 kind: pipeline
 type: docker
 name: deploy
 
+depends_on:
+- build 
+
 platform:
   os: linux
   arch: amd64
@@ -286,6 +291,7 @@ steps:
     envs:
     - drone_tag
     - drone_commit
+    - drone_commit_sha
     - drone_build_number
     - drone_repo_name
     - drone_repo_namespace
@@ -325,8 +331,9 @@ steps:
     - export ROOT=stack
     - cd /stack/gitea
     - "n=0\nwhile :\ndo\n  docker login $${REGISTRY_DOMAIN}:$${REGISTRY_PORT}/ --username client --password \"$${REGISTRY_PASSWORD}\" \\\\\n    && break  # substitute your command here\n  n=$((n+1))\n      if [ $n -ge 10 ]; then\n      echo \"login failed\"\n      exit 1\n  fi\n  echo \"retrying login..$n\"\n  sleep 5\ndone\n"
-    - sh .drone/pull.sh
+    - printenv
-    - sh .drone/deploy.sh
+    - sh .drone/pull.sh ${DRONE_COMMIT_SHA}
+    - sh .drone/deploy.sh ${DRONE_COMMIT_SHA}
   environment:
     GITEA_APP_NAME:
       from_secret: gitea-app-name
@@ -350,9 +357,11 @@ steps:
       from_secret: gitea-server-lfs-jwt-secret
 
 trigger:
-  event:
+  branch:
-  - promote
+    - separate-database
-  target:
+  #event:
-  - deploy
+  #- promote
+  #target:
+  #- deploy
 
 ...

.drone/pull.sh

@@ -1 +1 @@
-docker pull ${REGISTRY_DOMAIN}:${REGISTRY_PORT}/${ROOT}/${NAME}/gitea
+docker pull ${REGISTRY_DOMAIN}:${REGISTRY_PORT}/${ROOT}/${NAME}/gitea:$1

.drone/push.sh

@@ -1 +1 @@
-docker push ${REGISTRY_DOMAIN}:${REGISTRY_PORT}/${ROOT}/${NAME}/gitea
+docker push ${REGISTRY_DOMAIN}:${REGISTRY_PORT}/${ROOT}/${NAME}/gitea:$1

docker-compose.yml

@@ -7,7 +7,7 @@ services:
       replicas: 1
       restart_policy:
         condition: any
-    image: ${LOCAL_DOCKER_REGISTRY}gitea
+    image: ${LOCAL_DOCKER_REGISTRY}gitea:${TAG}
     environment:
       - USER_UID=1000
       - USER_GID=1000

gitea/Dockerfile

@@ -1,5 +1,5 @@
 ARG REGISTRY
-FROM ${REGISTRY}gitea/gitea:1.12.3-linux-amd64
+FROM gitea/gitea:1.20.5-linux-amd64
 COPY app.ini /init/
 COPY ./templates /init/templates/
 COPY run.sh /

gitea/templates/home.tmpl

@@ -3,7 +3,7 @@
 	<div class="ui stackable middle very relaxed page grid">
 		<div class="sixteen wide center aligned centered column">
 			<div>
-				<img class="logo" src="{{StaticUrlPrefix}}/img/gitea-lg.png" />
+				<img class="logo" src="{{AssetUrlPrefix}}/img/gitea-lg.png" />
 			</div>
 			<div class="hero">
 				<h1 class="ui icon header title">