From eb925049ac4aab369763fbecb0caaec3579977a3 Mon Sep 17 00:00:00 2001 From: Quentin Dufour Date: Tue, 19 Jan 2021 13:47:50 +0100 Subject: [PATCH] Remove web_static --- app/web_static/build/webpull/.gitignore | 1 - .../build/webpull/Dockerfile.nodejs | 9 -- app/web_static/build/webpull/Dockerfile.ruby | 12 --- app/web_static/build/webpull/README.md | 23 ---- app/web_static/build/webpull/main.go | 100 ------------------ app/web_static/deploy/web_static.hcl | 62 ----------- app/web_static/secrets/web/home_token | 1 - .../secrets/web/quentin.dufour.io_token | 1 - 8 files changed, 209 deletions(-) delete mode 100644 app/web_static/build/webpull/.gitignore delete mode 100644 app/web_static/build/webpull/Dockerfile.nodejs delete mode 100644 app/web_static/build/webpull/Dockerfile.ruby delete mode 100644 app/web_static/build/webpull/README.md delete mode 100644 app/web_static/build/webpull/main.go delete mode 100644 app/web_static/deploy/web_static.hcl delete mode 100644 app/web_static/secrets/web/home_token delete mode 100644 app/web_static/secrets/web/quentin.dufour.io_token diff --git a/app/web_static/build/webpull/.gitignore b/app/web_static/build/webpull/.gitignore deleted file mode 100644 index ba2906d..0000000 --- a/app/web_static/build/webpull/.gitignore +++ /dev/null @@ -1 +0,0 @@ -main diff --git a/app/web_static/build/webpull/Dockerfile.nodejs b/app/web_static/build/webpull/Dockerfile.nodejs deleted file mode 100644 index acc7e74..0000000 --- a/app/web_static/build/webpull/Dockerfile.nodejs +++ /dev/null @@ -1,9 +0,0 @@ -FROM node:13.8-buster - -RUN apt-get update && \ - apt-get install -y git - -COPY ./main /srv/httpd -WORKDIR /srv -CMD ["/srv/httpd"] - diff --git a/app/web_static/build/webpull/Dockerfile.ruby b/app/web_static/build/webpull/Dockerfile.ruby deleted file mode 100644 index 7578cca..0000000 --- a/app/web_static/build/webpull/Dockerfile.ruby +++ /dev/null @@ -1,12 +0,0 @@ -FROM fedora:32 - -ENV LC_ALL=C.UTF-8 -ENV LANG=C.UTF-8 -ENV LANGUAGE=en_US.UTF-8 -ENV RUBYOPT --disable-did_you_mean - -RUN dnf install -y git ruby ruby-devel rubygems rubygem-bundler @development-tools redhat-rpm-config gcc-c++ zlib-devel - -COPY ./main /srv/httpd -WORKDIR /srv -CMD ["/srv/httpd"] diff --git a/app/web_static/build/webpull/README.md b/app/web_static/build/webpull/README.md deleted file mode 100644 index 5d17d17..0000000 --- a/app/web_static/build/webpull/README.md +++ /dev/null @@ -1,23 +0,0 @@ -# webpull - -Webpull allows you to update your live website without deploying a new docker container but by simply calling an URL - -You need to specify a secret token at boot: - -``` -WEBPULL_TOKEN=s3cr3et ./webpull -``` - -## Node.js version - -``` -go build ./main.go -sudo docker build -f ./Dockerfile.nodejs -t superboum/amd64_webpull_pug:v1 . -``` - -## Ruby version - -``` -go build ./main.go -sudo docker build -f ./Dockerfile.ruby -t superboum/amd64_webpull_ruby:v1 . -``` diff --git a/app/web_static/build/webpull/main.go b/app/web_static/build/webpull/main.go deleted file mode 100644 index 46c90b9..0000000 --- a/app/web_static/build/webpull/main.go +++ /dev/null @@ -1,100 +0,0 @@ -package main - -import ( - "fmt" - "errors" - "io" - "os/exec" - "os" - "log" - "net/http" - "strings" -) - -func myexec(w io.Writer, main string, params ...string) error { - cmd := exec.Command(main, params...) - cmd.Stdout = w - cmd.Stderr = w - err := cmd.Run() - if err != nil { - fmt.Fprintf(w, "Failed to run: %s %s\n", main, strings.Join(params, " ")) - } - return err -} - -func update(w io.Writer) error { - fmt.Fprintf(w, "Start update...\n") - _, err := os.Stat("./.git") - if err != nil { - fmt.Fprintf(w, ".git folder does not exist, creating it...\n") - err := myexec(w, "git", "init") - if err != nil { - return err - } - } - - err = myexec(w, "git", "remote", "get-url", "origin") - if err != nil { - repo, exists := os.LookupEnv("WEBPULL_REPO") - if !exists { - fmt.Fprintf(w, "You must define WEBPULL_REPO env variable...\n") - return errors.New("Missing environment variable WEBPULL_REPO") - } - fmt.Fprintf(w, "git remote is not yet set...\n") - err := myexec(w, "git", "remote", "add", "origin", repo) - if err != nil { - return err - } - } - - err = myexec(w, "git", "pull", "origin", "master") - if err != nil { - fmt.Fprintf(w, "Failed to pull...\n") - return err - } - - _, err = os.Stat("./.webpull") - if err != nil { - fmt.Fprintf(w, "You must create an executable file named '.webpull' at the root of your repository.\nIf you have nothing to run, just create an empty bash script...\n") - return err - } - - err = myexec(w, "./.webpull") - if err != nil { - fmt.Fprintf(w, "An error occured during script execution\n") - return err - } - - fmt.Fprintf(w, "Success.\n") - return nil -} - -func main() { - token, exists := os.LookupEnv("WEBPULL_TOKEN") - if !exists { - log.Fatal("Environment variable 'WEBPULL_TOKEN' must be defined") - } - - if update(os.Stdout) != nil { - log.Fatal("Initial 'update' failed") - } - - fs := http.FileServer(http.Dir("./static")) - http.HandleFunc("/update", func(w http.ResponseWriter, r *http.Request) { - keys, ok := r.URL.Query()["token"] - if !ok || len(keys[0]) < 1 { - http.Error(w, "Missing 'token' query parameter", 401) - return - } - - if keys[0] != token { - http.Error(w, "Wrong token", 401) - return - } - - update(w) - }) - http.Handle("/", fs) - - log.Fatal(http.ListenAndServe(":8080", nil)) -} diff --git a/app/web_static/deploy/web_static.hcl b/app/web_static/deploy/web_static.hcl deleted file mode 100644 index 16c8b35..0000000 --- a/app/web_static/deploy/web_static.hcl +++ /dev/null @@ -1,62 +0,0 @@ -job "web_static" { - datacenters = ["dc1"] - type = "service" - - constraint { - attribute = "${attr.cpu.arch}" - value = "amd64" - } - - group "landing" { - network { - port "deuxfleurs_port" { to = 8080 } - } - - task "server" { - driver = "docker" - config { - image = "superboum/amd64_webpull_pug:v4" - ports = [ "deuxfleurs_port" ] - } - - template { - data = <