From 14b19a53f04660cce4a200a1e60c7c3d8ea6d4e3 Mon Sep 17 00:00:00 2001 From: realWLF Date: Sun, 23 Jun 2024 03:59:24 +0330 Subject: [PATCH] Fix with `npm run formatter-write` --- public/v4/apps/gogostv2.yml | 12 +++++----- public/v4/apps/gogostv3.yml | 46 ++++++++++++++++++------------------- 2 files changed, 29 insertions(+), 29 deletions(-) diff --git a/public/v4/apps/gogostv2.yml b/public/v4/apps/gogostv2.yml index 68f6aad46..2fa079b5f 100644 --- a/public/v4/apps/gogostv2.yml +++ b/public/v4/apps/gogostv2.yml @@ -12,24 +12,24 @@ services: containerHttpPort: 80 websocketSupport: true dockerfileLines: - - # Specify the base image for the app + - # Specify the base image for the app - FROM ubuntu:$$cap_gost_ubuntuversion - - # Set environment variables + - # Set environment variables - ARG UBUNTU_TIMEZONE - ENV TZ=${UBUNTU_TIMEZONE} - ENV DEBIAN_FRONTEND=noninteractive - - # Become Superuser + - # Become Superuser - USER root - - # Install necessary packages and download GOST + - # Install necessary packages and download GOST - RUN apt update && apt install -y wget - RUN wget -q https://github.com/ginuerzh/gost/releases/download/v2.11.5/gost-linux-amd64-2.11.5.gz - RUN gunzip -q gost-linux-amd64-2.11.5.gz - RUN mv gost-linux-amd64-2.11.5 /usr/local/bin/gost - RUN chmod +x /usr/local/bin/gost - - # Create dynamic start.sh script + - # Create dynamic start.sh script - RUN echo '#!/bin/bash\nprintenv\nexec /usr/local/bin/gost -L=tcp://:80/$TARGET_SERVER_IP:$TARGET_SERVER_NONSSL_PORT -L=tcp://:443/$TARGET_SERVER_IP:$TARGET_SERVER_SSL_PORT' > /start.sh - RUN chmod +x /start.sh - - # Make the entrance + - # Make the entrance - ENTRYPOINT ["/bin/bash", "/start.sh"] caproverOneClickApp: variables: diff --git a/public/v4/apps/gogostv3.yml b/public/v4/apps/gogostv3.yml index 41cecdf2e..c485fd185 100644 --- a/public/v4/apps/gogostv3.yml +++ b/public/v4/apps/gogostv3.yml @@ -11,28 +11,28 @@ services: containerHttpPort: 80 websocketSupport: true dockerfileLines: - - # Specify the base image for the app - - FROM alpine:$$cap_gost_alpineversion - - # Install necessary packages - - RUN apk update && apk add --no-cache wget tar bash yq-go iptables - - # Make directories needed - - RUN mkdir -p tmpfiles && mkdir -p /configuration - - # Download and prepare GOST binary - - RUN wget -q https://github.com/go-gost/gost/releases/download/v3.0.0-nightly.20240618/gost_3.0.0-nightly.20240618_linux_amd64.tar.gz - - RUN tar -xzf gost_3.0.0-nightly.20240618_linux_amd64.tar.gz -C tmpfiles && mv tmpfiles/gost /bin/gost && chmod +x /bin/gost - - # Remove temp files - - RUN rm -rf tmpfiles gost_3.0.0-nightly.20240618_linux_amd64.tar.gz - - # Create a base GOST config file - - RUN touch /configuration/gost.yaml - - RUN yq eval '.api.addr = ":$$cap_gost_api_port"' -i /configuration/gost.yaml - - RUN yq eval '.api.pathPrefix = "/$$cap_gost_api_path"' -i /configuration/gost.yaml - - RUN yq eval '.api.accesslog = $$cap_gost_api_alog' -i /configuration/gost.yaml - - RUN yq eval '.api.auth.username = "$$cap_gost_api_user"' -i /configuration/gost.yaml - - RUN yq eval '.api.auth.password = "$$cap_gost_api_password"' -i /configuration/gost.yaml - - # Make the entrance - - RUN printf '#!/bin/bash\nexec /bin/gost -C /configuration/gost.yaml' > /start.sh - - # Set the entrypoint - - ENTRYPOINT ["/bin/bash", "/start.sh"] + - # Specify the base image for the app + - FROM alpine:$$cap_gost_alpineversion + - # Install necessary packages + - RUN apk update && apk add --no-cache wget tar bash yq-go iptables + - # Make directories needed + - RUN mkdir -p tmpfiles && mkdir -p /configuration + - # Download and prepare GOST binary + - RUN wget -q https://github.com/go-gost/gost/releases/download/v3.0.0-nightly.20240618/gost_3.0.0-nightly.20240618_linux_amd64.tar.gz + - RUN tar -xzf gost_3.0.0-nightly.20240618_linux_amd64.tar.gz -C tmpfiles && mv tmpfiles/gost /bin/gost && chmod +x /bin/gost + - # Remove temp files + - RUN rm -rf tmpfiles gost_3.0.0-nightly.20240618_linux_amd64.tar.gz + - # Create a base GOST config file + - RUN touch /configuration/gost.yaml + - RUN yq eval '.api.addr = ":$$cap_gost_api_port"' -i /configuration/gost.yaml + - RUN yq eval '.api.pathPrefix = "/$$cap_gost_api_path"' -i /configuration/gost.yaml + - RUN yq eval '.api.accesslog = $$cap_gost_api_alog' -i /configuration/gost.yaml + - RUN yq eval '.api.auth.username = "$$cap_gost_api_user"' -i /configuration/gost.yaml + - RUN yq eval '.api.auth.password = "$$cap_gost_api_password"' -i /configuration/gost.yaml + - # Make the entrance + - RUN printf '#!/bin/bash\nexec /bin/gost -C /configuration/gost.yaml' > /start.sh + - # Set the entrypoint + - ENTRYPOINT ["/bin/bash", "/start.sh"] caproverOneClickApp: variables: - id: $$cap_gost_alpineversion @@ -69,7 +69,7 @@ caproverOneClickApp: Make GOST service at your exposal using its WebAPI end: |- GOST service has been successfully deployed! - + **API Address**: $$cap_appname.$$cap_root_domain:$$cap_gost_api_port/$$cap_gost_api_path/config **Username**: $$cap_gost_api_user **Password**: $$cap_gost_api_password