Skip to content

Commit

Permalink
Fix with npm run formatter-write
Browse files Browse the repository at this point in the history
  • Loading branch information
amirsaam committed Jun 23, 2024
1 parent 2cfc5e0 commit 14b19a5
Show file tree
Hide file tree
Showing 2 changed files with 29 additions and 29 deletions.
12 changes: 6 additions & 6 deletions public/v4/apps/gogostv2.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down
46 changes: 23 additions & 23 deletions public/v4/apps/gogostv3.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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
Expand Down

0 comments on commit 14b19a5

Please sign in to comment.