diff --git a/.drone.home.yml b/.drone.home.yml index 6cc287e..740a102 100644 --- a/.drone.home.yml +++ b/.drone.home.yml @@ -79,7 +79,7 @@ steps: LOCAL_DOCKER_REGISTRY: from_secret: local-docker-registry commands: - - cd ngrok2 + - cd ngrok-gitea - docker build . -t $${LOCAL_DOCKER_REGISTRY}ngrok-gitea - docker push $${LOCAL_DOCKER_REGISTRY}ngrok-gitea - name: build-letsencrypt-nginx diff --git a/.drone.remote.yml b/.drone.remote.yml index bfcfe7a..b4f377d 100644 --- a/.drone.remote.yml +++ b/.drone.remote.yml @@ -149,7 +149,7 @@ steps: LOCAL_DOCKER_REGISTRY: from_secret: local-docker-registry commands: - - cd ngrok2 + - cd ngrok-gitea - docker build . -t $${LOCAL_DOCKER_REGISTRY}ngrok-gitea - docker push $${LOCAL_DOCKER_REGISTRY}ngrok-gitea - name: build-letsencrypt-nginx diff --git a/.drone.star b/.drone.star index e39d86b..8d3b7c2 100644 --- a/.drone.star +++ b/.drone.star @@ -68,6 +68,7 @@ def steps(name, dependsOn): ]), wait(15, "wait"), build("guacamole-postgresql"), + build("ngrok-gitea"), { "name": "build", "image": "alpine", diff --git a/docker-compose-drone.yml b/docker-compose-drone.yml index 2932a0b..cfcb554 100644 --- a/docker-compose-drone.yml +++ b/docker-compose-drone.yml @@ -47,7 +47,7 @@ services: ports: - "4040:4040" volumes: - - ./ngrok2/ngrok.m._yml:/home/ngrok/.ngrok2/ngrok._yml:ro + - ./ngrok-gitea/ngrok.m._yml:/home/ngrok/.ngrok2/ngrok._yml:ro environment: - GIT_DOMAIN=${GIT_DOMAIN} - DRONE_DOMAIN=${DRONE_DOMAIN} diff --git a/docker-compose-home.yml b/docker-compose-home.yml index 7283c90..690a41d 100644 --- a/docker-compose-home.yml +++ b/docker-compose-home.yml @@ -101,14 +101,13 @@ services: ports: - "4040:4040" volumes: - - ./ngrok2/ngrok._yml:/home/ngrok/.ngrok2/ngrok._yml:ro + - ./ngrok-gitea/ngrok._yml:/home/ngrok/.ngrok2/ngrok._yml:ro environment: - GIT_DOMAIN=${GIT_DOMAIN} - DRONE_DOMAIN=${DRONE_DOMAIN} - REMOTE_DOMAIN=${REMOTE_DOMAIN} - BLOG_DOMAIN=${BLOG_DOMAIN} - CHAT_DOMAIN=${CHAT_DOMAIN} - #command: /bin/sh -c " cat /run/secrets/ngrok-auth-token /home/ngrok/.ngrok2/ngrok._yml > /home/ngrok/.ngrok2/ngrok.yml && ngrok start --all" depends_on: - gitea networks: diff --git a/docker-compose-remote.yml b/docker-compose-remote.yml index 62ee687..72aac33 100644 --- a/docker-compose-remote.yml +++ b/docker-compose-remote.yml @@ -47,7 +47,7 @@ services: ports: - "4040:4040" volumes: - - ./ngrok2/ngrok.m._yml:/home/ngrok/.ngrok2/ngrok._yml:ro + - ./ngrok-gitea/ngrok.m._yml:/home/ngrok/.ngrok2/ngrok._yml:ro environment: - GIT_DOMAIN=${GIT_DOMAIN} - DRONE_DOMAIN=${DRONE_DOMAIN} diff --git a/ngrok-build.sh b/ngrok-build.sh index eefa9df..3e827ae 100644 --- a/ngrok-build.sh +++ b/ngrok-build.sh @@ -1,2 +1,2 @@ -docker build ngrok2 -t ${LOCAL_DOCKER_REGISTRY}/ngrok-gitea +docker build ngrok-gitea -t ${LOCAL_DOCKER_REGISTRY}/ngrok-gitea docker push ${LOCAL_DOCKER_REGISTRY}/ngrok-gitea \ No newline at end of file diff --git a/ngrok2/Dockerfile b/ngrok-gitea/Dockerfile similarity index 100% rename from ngrok2/Dockerfile rename to ngrok-gitea/Dockerfile diff --git a/ngrok2/ngrok._yml b/ngrok-gitea/ngrok._yml similarity index 100% rename from ngrok2/ngrok._yml rename to ngrok-gitea/ngrok._yml diff --git a/ngrok2/ngrok.m._yml b/ngrok-gitea/ngrok.m._yml similarity index 100% rename from ngrok2/ngrok.m._yml rename to ngrok-gitea/ngrok.m._yml diff --git a/ngrok2/run.sh b/ngrok-gitea/run.sh similarity index 100% rename from ngrok2/run.sh rename to ngrok-gitea/run.sh