From 57a95fb9a79b90e616b214f21a331d098e63adbe Mon Sep 17 00:00:00 2001 From: David Dworken Date: Fri, 8 Apr 2022 23:56:02 -0700 Subject: [PATCH] Moved all backend code into the backend/ directory --- Makefile | 4 ++-- {k8s => backend/k8s}/hishtory-api.yaml | 0 {k8s => backend/k8s}/hishtory-static.yaml | 0 backend/server/Dockerfile | 8 ++++++++ {server => backend/server}/server.go | 0 {server => backend/server}/server_test.go | 0 {web => backend/web}/caddy/Caddyfile | 0 {web => backend/web}/caddy/Dockerfile | 4 ++-- {web => backend/web}/landing/www/.gitignore | 0 {web => backend/web}/landing/www/css/creative.css | 0 .../web}/landing/www/css/creative.min.css | 0 .../web}/landing/www/img/bg-masthead.jpg | Bin {web => backend/web}/landing/www/index.html | 0 {web => backend/web}/landing/www/js/creative.js | 0 {web => backend/web}/landing/www/js/creative.min.js | 0 .../www/vendor/bootstrap/js/bootstrap.bundle.js | 0 .../www/vendor/bootstrap/js/bootstrap.bundle.js.map | 0 .../www/vendor/bootstrap/js/bootstrap.bundle.min.js | 0 .../vendor/bootstrap/js/bootstrap.bundle.min.js.map | 0 .../landing/www/vendor/bootstrap/js/bootstrap.js | 0 .../www/vendor/bootstrap/js/bootstrap.js.map | 0 .../www/vendor/bootstrap/js/bootstrap.min.js | 0 .../www/vendor/bootstrap/js/bootstrap.min.js.map | 0 .../landing/www/vendor/fontawesome-free/css/all.css | 0 .../www/vendor/fontawesome-free/css/all.min.css | 0 .../www/vendor/fontawesome-free/css/brands.css | 0 .../www/vendor/fontawesome-free/css/brands.min.css | 0 .../www/vendor/fontawesome-free/css/fontawesome.css | 0 .../vendor/fontawesome-free/css/fontawesome.min.css | 0 .../www/vendor/fontawesome-free/css/regular.css | 0 .../www/vendor/fontawesome-free/css/regular.min.css | 0 .../www/vendor/fontawesome-free/css/solid.css | 0 .../www/vendor/fontawesome-free/css/solid.min.css | 0 .../www/vendor/fontawesome-free/css/svg-with-js.css | 0 .../vendor/fontawesome-free/css/svg-with-js.min.css | 0 .../www/vendor/fontawesome-free/css/v4-shims.css | 0 .../vendor/fontawesome-free/css/v4-shims.min.css | 0 .../fontawesome-free/webfonts/fa-brands-400.eot | Bin .../fontawesome-free/webfonts/fa-brands-400.svg | 0 .../fontawesome-free/webfonts/fa-brands-400.ttf | Bin .../fontawesome-free/webfonts/fa-brands-400.woff | Bin .../fontawesome-free/webfonts/fa-brands-400.woff2 | Bin .../fontawesome-free/webfonts/fa-regular-400.eot | Bin .../fontawesome-free/webfonts/fa-regular-400.svg | 0 .../fontawesome-free/webfonts/fa-regular-400.ttf | Bin .../fontawesome-free/webfonts/fa-regular-400.woff | Bin .../fontawesome-free/webfonts/fa-regular-400.woff2 | Bin .../fontawesome-free/webfonts/fa-solid-900.eot | Bin .../fontawesome-free/webfonts/fa-solid-900.svg | 0 .../fontawesome-free/webfonts/fa-solid-900.ttf | Bin .../fontawesome-free/webfonts/fa-solid-900.woff | Bin .../fontawesome-free/webfonts/fa-solid-900.woff2 | Bin .../jquery-easing/jquery.easing.compatibility.js | 0 .../www/vendor/jquery-easing/jquery.easing.js | 0 .../www/vendor/jquery-easing/jquery.easing.min.js | 0 .../web}/landing/www/vendor/jquery/jquery.js | 0 .../web}/landing/www/vendor/jquery/jquery.min.js | 0 .../web}/landing/www/vendor/jquery/jquery.min.map | 0 .../web}/landing/www/vendor/jquery/jquery.slim.js | 0 .../landing/www/vendor/jquery/jquery.slim.min.js | 0 .../landing/www/vendor/jquery/jquery.slim.min.map | 0 .../vendor/magnific-popup/jquery.magnific-popup.js | 0 .../magnific-popup/jquery.magnific-popup.min.js | 0 .../www/vendor/magnific-popup/magnific-popup.css | 0 server/Dockerfile | 2 +- shared/testutils.go | 2 +- 66 files changed, 14 insertions(+), 6 deletions(-) rename {k8s => backend/k8s}/hishtory-api.yaml (100%) rename {k8s => backend/k8s}/hishtory-static.yaml (100%) create mode 100644 backend/server/Dockerfile rename {server => backend/server}/server.go (100%) rename {server => backend/server}/server_test.go (100%) rename {web => backend/web}/caddy/Caddyfile (100%) rename {web => backend/web}/caddy/Dockerfile (53%) rename {web => backend/web}/landing/www/.gitignore (100%) rename {web => backend/web}/landing/www/css/creative.css (100%) rename {web => backend/web}/landing/www/css/creative.min.css (100%) rename {web => backend/web}/landing/www/img/bg-masthead.jpg (100%) rename {web => backend/web}/landing/www/index.html (100%) rename {web => backend/web}/landing/www/js/creative.js (100%) rename {web => backend/web}/landing/www/js/creative.min.js (100%) rename {web => backend/web}/landing/www/vendor/bootstrap/js/bootstrap.bundle.js (100%) rename {web => backend/web}/landing/www/vendor/bootstrap/js/bootstrap.bundle.js.map (100%) rename {web => backend/web}/landing/www/vendor/bootstrap/js/bootstrap.bundle.min.js (100%) rename {web => backend/web}/landing/www/vendor/bootstrap/js/bootstrap.bundle.min.js.map (100%) rename {web => backend/web}/landing/www/vendor/bootstrap/js/bootstrap.js (100%) rename {web => backend/web}/landing/www/vendor/bootstrap/js/bootstrap.js.map (100%) rename {web => backend/web}/landing/www/vendor/bootstrap/js/bootstrap.min.js (100%) rename {web => backend/web}/landing/www/vendor/bootstrap/js/bootstrap.min.js.map (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/css/all.css (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/css/all.min.css (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/css/brands.css (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/css/brands.min.css (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/css/fontawesome.css (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/css/fontawesome.min.css (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/css/regular.css (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/css/regular.min.css (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/css/solid.css (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/css/solid.min.css (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/css/svg-with-js.css (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/css/svg-with-js.min.css (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/css/v4-shims.css (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/css/v4-shims.min.css (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/webfonts/fa-brands-400.eot (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/webfonts/fa-brands-400.svg (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/webfonts/fa-brands-400.ttf (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/webfonts/fa-brands-400.woff (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/webfonts/fa-brands-400.woff2 (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/webfonts/fa-regular-400.eot (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/webfonts/fa-regular-400.svg (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/webfonts/fa-regular-400.ttf (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/webfonts/fa-regular-400.woff (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/webfonts/fa-regular-400.woff2 (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/webfonts/fa-solid-900.eot (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/webfonts/fa-solid-900.svg (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/webfonts/fa-solid-900.ttf (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/webfonts/fa-solid-900.woff (100%) rename {web => backend/web}/landing/www/vendor/fontawesome-free/webfonts/fa-solid-900.woff2 (100%) rename {web => backend/web}/landing/www/vendor/jquery-easing/jquery.easing.compatibility.js (100%) rename {web => backend/web}/landing/www/vendor/jquery-easing/jquery.easing.js (100%) rename {web => backend/web}/landing/www/vendor/jquery-easing/jquery.easing.min.js (100%) rename {web => backend/web}/landing/www/vendor/jquery/jquery.js (100%) rename {web => backend/web}/landing/www/vendor/jquery/jquery.min.js (100%) rename {web => backend/web}/landing/www/vendor/jquery/jquery.min.map (100%) rename {web => backend/web}/landing/www/vendor/jquery/jquery.slim.js (100%) rename {web => backend/web}/landing/www/vendor/jquery/jquery.slim.min.js (100%) rename {web => backend/web}/landing/www/vendor/jquery/jquery.slim.min.map (100%) rename {web => backend/web}/landing/www/vendor/magnific-popup/jquery.magnific-popup.js (100%) rename {web => backend/web}/landing/www/vendor/magnific-popup/jquery.magnific-popup.min.js (100%) rename {web => backend/web}/landing/www/vendor/magnific-popup/magnific-popup.css (100%) diff --git a/Makefile b/Makefile index db9e2e3..7b446a5 100644 --- a/Makefile +++ b/Makefile @@ -10,10 +10,10 @@ release: git push --tags build-static: - docker build -t gcr.io/dworken-k8s/hishtory-static -f web/caddy/Dockerfile . + docker build -t gcr.io/dworken-k8s/hishtory-static -f backend/web/caddy/Dockerfile . build-api: - docker build -t gcr.io/dworken-k8s/hishtory-api -f server/Dockerfile . + docker build -t gcr.io/dworken-k8s/hishtory-api -f backend/server/Dockerfile . deploy-static: build-static docker push gcr.io/dworken-k8s/hishtory-static diff --git a/k8s/hishtory-api.yaml b/backend/k8s/hishtory-api.yaml similarity index 100% rename from k8s/hishtory-api.yaml rename to backend/k8s/hishtory-api.yaml diff --git a/k8s/hishtory-static.yaml b/backend/k8s/hishtory-static.yaml similarity index 100% rename from k8s/hishtory-static.yaml rename to backend/k8s/hishtory-static.yaml diff --git a/backend/server/Dockerfile b/backend/server/Dockerfile new file mode 100644 index 0000000..e2aeacc --- /dev/null +++ b/backend/server/Dockerfile @@ -0,0 +1,8 @@ +FROM golang:1.17 +COPY go.mod ./ +COPY go.sum ./ +RUN unset GOPATH; go mod download +COPY . ./ +RUN unset GOPATH; go build -o /server -ldflags "-X main.ReleaseVersion=v0.`cat VERSION`" backend/server/server.go +CMD [ "/server" ] + diff --git a/server/server.go b/backend/server/server.go similarity index 100% rename from server/server.go rename to backend/server/server.go diff --git a/server/server_test.go b/backend/server/server_test.go similarity index 100% rename from server/server_test.go rename to backend/server/server_test.go diff --git a/web/caddy/Caddyfile b/backend/web/caddy/Caddyfile similarity index 100% rename from web/caddy/Caddyfile rename to backend/web/caddy/Caddyfile diff --git a/web/caddy/Dockerfile b/backend/web/caddy/Dockerfile similarity index 53% rename from web/caddy/Dockerfile rename to backend/web/caddy/Dockerfile index c67d401..fc1562e 100644 --- a/web/caddy/Dockerfile +++ b/backend/web/caddy/Dockerfile @@ -2,5 +2,5 @@ FROM abiosoft/caddy LABEL "com.datadoghq.ad.logs"='[{"source": "caddy", "service": "web"}]' -COPY web/caddy/Caddyfile /etc/ -COPY web/landing/www/ /srv/landing +COPY backend/web/caddy/Caddyfile /etc/ +COPY backend/web/landing/www/ /srv/landing diff --git a/web/landing/www/.gitignore b/backend/web/landing/www/.gitignore similarity index 100% rename from web/landing/www/.gitignore rename to backend/web/landing/www/.gitignore diff --git a/web/landing/www/css/creative.css b/backend/web/landing/www/css/creative.css similarity index 100% rename from web/landing/www/css/creative.css rename to backend/web/landing/www/css/creative.css diff --git a/web/landing/www/css/creative.min.css b/backend/web/landing/www/css/creative.min.css similarity index 100% rename from web/landing/www/css/creative.min.css rename to backend/web/landing/www/css/creative.min.css diff --git a/web/landing/www/img/bg-masthead.jpg b/backend/web/landing/www/img/bg-masthead.jpg similarity index 100% rename from web/landing/www/img/bg-masthead.jpg rename to backend/web/landing/www/img/bg-masthead.jpg diff --git a/web/landing/www/index.html b/backend/web/landing/www/index.html similarity index 100% rename from web/landing/www/index.html rename to backend/web/landing/www/index.html diff --git a/web/landing/www/js/creative.js b/backend/web/landing/www/js/creative.js similarity index 100% rename from web/landing/www/js/creative.js rename to backend/web/landing/www/js/creative.js diff --git a/web/landing/www/js/creative.min.js b/backend/web/landing/www/js/creative.min.js similarity index 100% rename from web/landing/www/js/creative.min.js rename to backend/web/landing/www/js/creative.min.js diff --git a/web/landing/www/vendor/bootstrap/js/bootstrap.bundle.js b/backend/web/landing/www/vendor/bootstrap/js/bootstrap.bundle.js similarity index 100% rename from web/landing/www/vendor/bootstrap/js/bootstrap.bundle.js rename to backend/web/landing/www/vendor/bootstrap/js/bootstrap.bundle.js diff --git a/web/landing/www/vendor/bootstrap/js/bootstrap.bundle.js.map b/backend/web/landing/www/vendor/bootstrap/js/bootstrap.bundle.js.map similarity index 100% rename from web/landing/www/vendor/bootstrap/js/bootstrap.bundle.js.map rename to backend/web/landing/www/vendor/bootstrap/js/bootstrap.bundle.js.map diff --git a/web/landing/www/vendor/bootstrap/js/bootstrap.bundle.min.js b/backend/web/landing/www/vendor/bootstrap/js/bootstrap.bundle.min.js similarity index 100% rename from web/landing/www/vendor/bootstrap/js/bootstrap.bundle.min.js rename to backend/web/landing/www/vendor/bootstrap/js/bootstrap.bundle.min.js diff --git a/web/landing/www/vendor/bootstrap/js/bootstrap.bundle.min.js.map b/backend/web/landing/www/vendor/bootstrap/js/bootstrap.bundle.min.js.map similarity index 100% rename from web/landing/www/vendor/bootstrap/js/bootstrap.bundle.min.js.map rename to backend/web/landing/www/vendor/bootstrap/js/bootstrap.bundle.min.js.map diff --git a/web/landing/www/vendor/bootstrap/js/bootstrap.js b/backend/web/landing/www/vendor/bootstrap/js/bootstrap.js similarity index 100% rename from web/landing/www/vendor/bootstrap/js/bootstrap.js rename to backend/web/landing/www/vendor/bootstrap/js/bootstrap.js diff --git a/web/landing/www/vendor/bootstrap/js/bootstrap.js.map b/backend/web/landing/www/vendor/bootstrap/js/bootstrap.js.map similarity index 100% rename from web/landing/www/vendor/bootstrap/js/bootstrap.js.map rename to backend/web/landing/www/vendor/bootstrap/js/bootstrap.js.map diff --git a/web/landing/www/vendor/bootstrap/js/bootstrap.min.js b/backend/web/landing/www/vendor/bootstrap/js/bootstrap.min.js similarity index 100% rename from web/landing/www/vendor/bootstrap/js/bootstrap.min.js rename to backend/web/landing/www/vendor/bootstrap/js/bootstrap.min.js diff --git a/web/landing/www/vendor/bootstrap/js/bootstrap.min.js.map b/backend/web/landing/www/vendor/bootstrap/js/bootstrap.min.js.map similarity index 100% rename from web/landing/www/vendor/bootstrap/js/bootstrap.min.js.map rename to backend/web/landing/www/vendor/bootstrap/js/bootstrap.min.js.map diff --git a/web/landing/www/vendor/fontawesome-free/css/all.css b/backend/web/landing/www/vendor/fontawesome-free/css/all.css similarity index 100% rename from web/landing/www/vendor/fontawesome-free/css/all.css rename to backend/web/landing/www/vendor/fontawesome-free/css/all.css diff --git a/web/landing/www/vendor/fontawesome-free/css/all.min.css b/backend/web/landing/www/vendor/fontawesome-free/css/all.min.css similarity index 100% rename from web/landing/www/vendor/fontawesome-free/css/all.min.css rename to backend/web/landing/www/vendor/fontawesome-free/css/all.min.css diff --git a/web/landing/www/vendor/fontawesome-free/css/brands.css b/backend/web/landing/www/vendor/fontawesome-free/css/brands.css similarity index 100% rename from web/landing/www/vendor/fontawesome-free/css/brands.css rename to backend/web/landing/www/vendor/fontawesome-free/css/brands.css diff --git a/web/landing/www/vendor/fontawesome-free/css/brands.min.css b/backend/web/landing/www/vendor/fontawesome-free/css/brands.min.css similarity index 100% rename from web/landing/www/vendor/fontawesome-free/css/brands.min.css rename to backend/web/landing/www/vendor/fontawesome-free/css/brands.min.css diff --git a/web/landing/www/vendor/fontawesome-free/css/fontawesome.css b/backend/web/landing/www/vendor/fontawesome-free/css/fontawesome.css similarity index 100% rename from web/landing/www/vendor/fontawesome-free/css/fontawesome.css rename to backend/web/landing/www/vendor/fontawesome-free/css/fontawesome.css diff --git a/web/landing/www/vendor/fontawesome-free/css/fontawesome.min.css b/backend/web/landing/www/vendor/fontawesome-free/css/fontawesome.min.css similarity index 100% rename from web/landing/www/vendor/fontawesome-free/css/fontawesome.min.css rename to backend/web/landing/www/vendor/fontawesome-free/css/fontawesome.min.css diff --git a/web/landing/www/vendor/fontawesome-free/css/regular.css b/backend/web/landing/www/vendor/fontawesome-free/css/regular.css similarity index 100% rename from web/landing/www/vendor/fontawesome-free/css/regular.css rename to backend/web/landing/www/vendor/fontawesome-free/css/regular.css diff --git a/web/landing/www/vendor/fontawesome-free/css/regular.min.css b/backend/web/landing/www/vendor/fontawesome-free/css/regular.min.css similarity index 100% rename from web/landing/www/vendor/fontawesome-free/css/regular.min.css rename to backend/web/landing/www/vendor/fontawesome-free/css/regular.min.css diff --git a/web/landing/www/vendor/fontawesome-free/css/solid.css b/backend/web/landing/www/vendor/fontawesome-free/css/solid.css similarity index 100% rename from web/landing/www/vendor/fontawesome-free/css/solid.css rename to backend/web/landing/www/vendor/fontawesome-free/css/solid.css diff --git a/web/landing/www/vendor/fontawesome-free/css/solid.min.css b/backend/web/landing/www/vendor/fontawesome-free/css/solid.min.css similarity index 100% rename from web/landing/www/vendor/fontawesome-free/css/solid.min.css rename to backend/web/landing/www/vendor/fontawesome-free/css/solid.min.css diff --git a/web/landing/www/vendor/fontawesome-free/css/svg-with-js.css b/backend/web/landing/www/vendor/fontawesome-free/css/svg-with-js.css similarity index 100% rename from web/landing/www/vendor/fontawesome-free/css/svg-with-js.css rename to backend/web/landing/www/vendor/fontawesome-free/css/svg-with-js.css diff --git a/web/landing/www/vendor/fontawesome-free/css/svg-with-js.min.css b/backend/web/landing/www/vendor/fontawesome-free/css/svg-with-js.min.css similarity index 100% rename from web/landing/www/vendor/fontawesome-free/css/svg-with-js.min.css rename to backend/web/landing/www/vendor/fontawesome-free/css/svg-with-js.min.css diff --git a/web/landing/www/vendor/fontawesome-free/css/v4-shims.css b/backend/web/landing/www/vendor/fontawesome-free/css/v4-shims.css similarity index 100% rename from web/landing/www/vendor/fontawesome-free/css/v4-shims.css rename to backend/web/landing/www/vendor/fontawesome-free/css/v4-shims.css diff --git a/web/landing/www/vendor/fontawesome-free/css/v4-shims.min.css b/backend/web/landing/www/vendor/fontawesome-free/css/v4-shims.min.css similarity index 100% rename from web/landing/www/vendor/fontawesome-free/css/v4-shims.min.css rename to backend/web/landing/www/vendor/fontawesome-free/css/v4-shims.min.css diff --git a/web/landing/www/vendor/fontawesome-free/webfonts/fa-brands-400.eot b/backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-brands-400.eot similarity index 100% rename from web/landing/www/vendor/fontawesome-free/webfonts/fa-brands-400.eot rename to backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-brands-400.eot diff --git a/web/landing/www/vendor/fontawesome-free/webfonts/fa-brands-400.svg b/backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-brands-400.svg similarity index 100% rename from web/landing/www/vendor/fontawesome-free/webfonts/fa-brands-400.svg rename to backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-brands-400.svg diff --git a/web/landing/www/vendor/fontawesome-free/webfonts/fa-brands-400.ttf b/backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-brands-400.ttf similarity index 100% rename from web/landing/www/vendor/fontawesome-free/webfonts/fa-brands-400.ttf rename to backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-brands-400.ttf diff --git a/web/landing/www/vendor/fontawesome-free/webfonts/fa-brands-400.woff b/backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-brands-400.woff similarity index 100% rename from web/landing/www/vendor/fontawesome-free/webfonts/fa-brands-400.woff rename to backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-brands-400.woff diff --git a/web/landing/www/vendor/fontawesome-free/webfonts/fa-brands-400.woff2 b/backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-brands-400.woff2 similarity index 100% rename from web/landing/www/vendor/fontawesome-free/webfonts/fa-brands-400.woff2 rename to backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-brands-400.woff2 diff --git a/web/landing/www/vendor/fontawesome-free/webfonts/fa-regular-400.eot b/backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-regular-400.eot similarity index 100% rename from web/landing/www/vendor/fontawesome-free/webfonts/fa-regular-400.eot rename to backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-regular-400.eot diff --git a/web/landing/www/vendor/fontawesome-free/webfonts/fa-regular-400.svg b/backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-regular-400.svg similarity index 100% rename from web/landing/www/vendor/fontawesome-free/webfonts/fa-regular-400.svg rename to backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-regular-400.svg diff --git a/web/landing/www/vendor/fontawesome-free/webfonts/fa-regular-400.ttf b/backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-regular-400.ttf similarity index 100% rename from web/landing/www/vendor/fontawesome-free/webfonts/fa-regular-400.ttf rename to backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-regular-400.ttf diff --git a/web/landing/www/vendor/fontawesome-free/webfonts/fa-regular-400.woff b/backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-regular-400.woff similarity index 100% rename from web/landing/www/vendor/fontawesome-free/webfonts/fa-regular-400.woff rename to backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-regular-400.woff diff --git a/web/landing/www/vendor/fontawesome-free/webfonts/fa-regular-400.woff2 b/backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-regular-400.woff2 similarity index 100% rename from web/landing/www/vendor/fontawesome-free/webfonts/fa-regular-400.woff2 rename to backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-regular-400.woff2 diff --git a/web/landing/www/vendor/fontawesome-free/webfonts/fa-solid-900.eot b/backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-solid-900.eot similarity index 100% rename from web/landing/www/vendor/fontawesome-free/webfonts/fa-solid-900.eot rename to backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-solid-900.eot diff --git a/web/landing/www/vendor/fontawesome-free/webfonts/fa-solid-900.svg b/backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-solid-900.svg similarity index 100% rename from web/landing/www/vendor/fontawesome-free/webfonts/fa-solid-900.svg rename to backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-solid-900.svg diff --git a/web/landing/www/vendor/fontawesome-free/webfonts/fa-solid-900.ttf b/backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-solid-900.ttf similarity index 100% rename from web/landing/www/vendor/fontawesome-free/webfonts/fa-solid-900.ttf rename to backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-solid-900.ttf diff --git a/web/landing/www/vendor/fontawesome-free/webfonts/fa-solid-900.woff b/backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-solid-900.woff similarity index 100% rename from web/landing/www/vendor/fontawesome-free/webfonts/fa-solid-900.woff rename to backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-solid-900.woff diff --git a/web/landing/www/vendor/fontawesome-free/webfonts/fa-solid-900.woff2 b/backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-solid-900.woff2 similarity index 100% rename from web/landing/www/vendor/fontawesome-free/webfonts/fa-solid-900.woff2 rename to backend/web/landing/www/vendor/fontawesome-free/webfonts/fa-solid-900.woff2 diff --git a/web/landing/www/vendor/jquery-easing/jquery.easing.compatibility.js b/backend/web/landing/www/vendor/jquery-easing/jquery.easing.compatibility.js similarity index 100% rename from web/landing/www/vendor/jquery-easing/jquery.easing.compatibility.js rename to backend/web/landing/www/vendor/jquery-easing/jquery.easing.compatibility.js diff --git a/web/landing/www/vendor/jquery-easing/jquery.easing.js b/backend/web/landing/www/vendor/jquery-easing/jquery.easing.js similarity index 100% rename from web/landing/www/vendor/jquery-easing/jquery.easing.js rename to backend/web/landing/www/vendor/jquery-easing/jquery.easing.js diff --git a/web/landing/www/vendor/jquery-easing/jquery.easing.min.js b/backend/web/landing/www/vendor/jquery-easing/jquery.easing.min.js similarity index 100% rename from web/landing/www/vendor/jquery-easing/jquery.easing.min.js rename to backend/web/landing/www/vendor/jquery-easing/jquery.easing.min.js diff --git a/web/landing/www/vendor/jquery/jquery.js b/backend/web/landing/www/vendor/jquery/jquery.js similarity index 100% rename from web/landing/www/vendor/jquery/jquery.js rename to backend/web/landing/www/vendor/jquery/jquery.js diff --git a/web/landing/www/vendor/jquery/jquery.min.js b/backend/web/landing/www/vendor/jquery/jquery.min.js similarity index 100% rename from web/landing/www/vendor/jquery/jquery.min.js rename to backend/web/landing/www/vendor/jquery/jquery.min.js diff --git a/web/landing/www/vendor/jquery/jquery.min.map b/backend/web/landing/www/vendor/jquery/jquery.min.map similarity index 100% rename from web/landing/www/vendor/jquery/jquery.min.map rename to backend/web/landing/www/vendor/jquery/jquery.min.map diff --git a/web/landing/www/vendor/jquery/jquery.slim.js b/backend/web/landing/www/vendor/jquery/jquery.slim.js similarity index 100% rename from web/landing/www/vendor/jquery/jquery.slim.js rename to backend/web/landing/www/vendor/jquery/jquery.slim.js diff --git a/web/landing/www/vendor/jquery/jquery.slim.min.js b/backend/web/landing/www/vendor/jquery/jquery.slim.min.js similarity index 100% rename from web/landing/www/vendor/jquery/jquery.slim.min.js rename to backend/web/landing/www/vendor/jquery/jquery.slim.min.js diff --git a/web/landing/www/vendor/jquery/jquery.slim.min.map b/backend/web/landing/www/vendor/jquery/jquery.slim.min.map similarity index 100% rename from web/landing/www/vendor/jquery/jquery.slim.min.map rename to backend/web/landing/www/vendor/jquery/jquery.slim.min.map diff --git a/web/landing/www/vendor/magnific-popup/jquery.magnific-popup.js b/backend/web/landing/www/vendor/magnific-popup/jquery.magnific-popup.js similarity index 100% rename from web/landing/www/vendor/magnific-popup/jquery.magnific-popup.js rename to backend/web/landing/www/vendor/magnific-popup/jquery.magnific-popup.js diff --git a/web/landing/www/vendor/magnific-popup/jquery.magnific-popup.min.js b/backend/web/landing/www/vendor/magnific-popup/jquery.magnific-popup.min.js similarity index 100% rename from web/landing/www/vendor/magnific-popup/jquery.magnific-popup.min.js rename to backend/web/landing/www/vendor/magnific-popup/jquery.magnific-popup.min.js diff --git a/web/landing/www/vendor/magnific-popup/magnific-popup.css b/backend/web/landing/www/vendor/magnific-popup/magnific-popup.css similarity index 100% rename from web/landing/www/vendor/magnific-popup/magnific-popup.css rename to backend/web/landing/www/vendor/magnific-popup/magnific-popup.css diff --git a/server/Dockerfile b/server/Dockerfile index d6eca99..14276d9 100644 --- a/server/Dockerfile +++ b/server/Dockerfile @@ -3,6 +3,6 @@ COPY go.mod ./ COPY go.sum ./ RUN unset GOPATH; go mod download COPY . ./ -RUN unset GOPATH; cat VERSION; go build -o /server -ldflags "-X main.ReleaseVersion=v0.`cat VERSION`" server/server.go +RUN unset GOPATH; cat VERSION; go build -o /server -ldflags "-X main.ReleaseVersion=v0.`cat VERSION`" backend/server/server.go CMD [ "/server" ] diff --git a/shared/testutils.go b/shared/testutils.go index d070eae..746211e 100644 --- a/shared/testutils.go +++ b/shared/testutils.go @@ -40,7 +40,7 @@ func buildServer(t *testing.T) { if err != nil { t.Fatalf("failed to chdir: %v", err) } - cmd := exec.Command("go", "build", "-o", "/tmp/server", "server/server.go") + cmd := exec.Command("go", "build", "-o", "/tmp/server", "backend/server/server.go") var stdout bytes.Buffer cmd.Stdout = &stdout var stderr bytes.Buffer