From d3ce8d4f7c3b0a3a966a1a2486b5e5fd1581456a Mon Sep 17 00:00:00 2001 From: Felix Linker Date: Sat, 23 Jan 2021 15:15:38 +0100 Subject: [PATCH] Remove unused hosting and CI files --- .dockerignore | 77 ------------------------------------- .gitlab-ci.yml | 13 ------- .travis.yml | 16 -------- Dockerfile | 36 ----------------- Dockerfile.dev | 36 ----------------- docker-compose.yml | 44 --------------------- nginx.conf | 96 ---------------------------------------------- 7 files changed, 318 deletions(-) delete mode 100644 .dockerignore delete mode 100644 .gitlab-ci.yml delete mode 100644 .travis.yml delete mode 100644 Dockerfile delete mode 100644 Dockerfile.dev delete mode 100644 docker-compose.yml delete mode 100644 nginx.conf diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index c43179e2..00000000 --- a/.dockerignore +++ /dev/null @@ -1,77 +0,0 @@ -node_modules -npm-debug.log -### Node template -# Logs -logs -*.log -npm-debug.log* -yarn-debug.log* -yarn-error.log* - -# Runtime data -pids -*.pid -*.seed -*.pid.lock - -# Directory for instrumented libs generated by jscoverage/JSCover -lib-cov - -# Coverage directory used by tools like istanbul -coverage - -# nyc test coverage -.nyc_output - -# Grunt intermediate storage (http://gruntjs.com/creating-plugins#storing-task-files) -.grunt - -# Bower dependency directory (https://bower.io/) -bower_components - -# node-waf configuration -.lock-wscript - -# Compiled binary addons (https://nodejs.org/api/addons.html) -build/Release - -# Dependency directories -node_modules/ -jspm_packages/ - -# TypeScript v1 declaration files -typings/ - -# Optional npm cache directory -.npm - -# Optional eslint cache -.eslintcache - -# Optional REPL history -.node_repl_history - -# Output of 'npm pack' -*.tgz - -# Yarn Integrity file -.yarn-integrity - -# dotenv environment variables file -.env - -# parcel-bundler cache (https://parceljs.org/) -.cache - -# next.js build output -.next - -# nuxt.js build output -.nuxt - -# vuepress build output -.vuepress/dist - -# Serverless directories -.serverless - diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml deleted file mode 100644 index 85d3a7f5..00000000 --- a/.gitlab-ci.yml +++ /dev/null @@ -1,13 +0,0 @@ -image: docker:stable -services: - - docker:dind - -stages: - - Build image - -docker build: - stage: Build image - script: - - img build --build-arg branch=$CI_COMMIT_REF_NAME -t edcd/coriolis:$CI_COMMIT_REF_NAME . - - echo "$REGISTRY_PASSWORD" | img login --username "$REGISTRY_USER" --password-stdin - - img push edcd/coriolis:$CI_COMMIT_REF_NAME diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 49fe7b3e..00000000 --- a/.travis.yml +++ /dev/null @@ -1,16 +0,0 @@ -language: node_js -notifications: - email: false -sudo: false -node_js: - - "4.8.1" -cache: - directories: - - node_modules - -before_install: - - git clone https://github.com/EDCD/coriolis-data.git ../coriolis-data - -script: - - npm run lint - - npm test diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index fb4d3284..00000000 --- a/Dockerfile +++ /dev/null @@ -1,36 +0,0 @@ -### STAGE 1: Build ### -FROM node:9.11.1-alpine as builder -ENV BRANCH=master -WORKDIR /src/app -RUN mkdir -p /src/app/coriolis -RUN mkdir -p /src/app/coriolis-data - -RUN apk add --update git - -RUN npm i -g npm -ADD https://api.github.com/repos/edcd/coriolis-data/git/refs/heads/master /tmp/version.json - -# Set up coriolis-data -WORKDIR /src/app/coriolis-data -RUN git clone https://github.com/EDCD/coriolis-data.git . -RUN git checkout ${BRANCH} -RUN npm install --no-package-lock -RUN npm start - - -ADD https://api.github.com/repos/edcd/coriolis/git/refs/heads/master /tmp/version.json -# Set up coriolis -WORKDIR /src/app/coriolis -RUN git clone https://github.com/EDCD/coriolis.git . -RUN git checkout ${BRANCH} -RUN npm install --no-package-lock -RUN npm run build - - -### STAGE 2: Production Environment ### -FROM fholzer/nginx-brotli as web -COPY nginx.conf /etc/nginx/nginx.conf -COPY --from=builder /src/app/coriolis/build /usr/share/nginx/html -WORKDIR /usr/share/nginx/html -EXPOSE 80 -CMD ["nginx", "-c", "/etc/nginx/nginx.conf", "-g", "daemon off;"] diff --git a/Dockerfile.dev b/Dockerfile.dev deleted file mode 100644 index 9934de70..00000000 --- a/Dockerfile.dev +++ /dev/null @@ -1,36 +0,0 @@ -### STAGE 1: Build ### -FROM node:9.11.1-alpine as builder -ENV BRANCH=develop -WORKDIR /src/app -RUN mkdir -p /src/app/coriolis -RUN mkdir -p /src/app/coriolis-data - -RUN apk add --update git - -RUN npm i -g npm - -ADD https://api.github.com/repos/edcd/coriolis-data/git/refs/heads/develop /tmp/version.json -# Set up coriolis-data -WORKDIR /src/app/coriolis-data -RUN git clone https://github.com/EDCD/coriolis-data.git . -RUN git checkout ${BRANCH} -RUN npm install --no-package-lock -RUN npm start - - -ADD https://api.github.com/repos/edcd/coriolis/git/refs/heads/develop /tmp/version.json -# Set up coriolis -WORKDIR /src/app/coriolis -RUN git clone https://github.com/EDCD/coriolis.git . -RUN git checkout ${BRANCH} -RUN npm install --no-package-lock -RUN npm run build - - -### STAGE 2: Production Environment ### -FROM fholzer/nginx-brotli as web -COPY nginx.conf /etc/nginx/nginx.conf -COPY --from=builder /src/app/coriolis/build /usr/share/nginx/html -WORKDIR /usr/share/nginx/html -EXPOSE 80 -CMD ["nginx", "-c", "/etc/nginx/nginx.conf", "-g", "daemon off;"] diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 4fbaee70..00000000 --- a/docker-compose.yml +++ /dev/null @@ -1,44 +0,0 @@ -version: '3.6' - -services: - master: - image: edcd/coriolis:master - build: - dockerfile: Dockerfile - context: . - args: - branch: master - restart: always - volumes: - - ./nginx.conf:/etc/nginx/nginx.conf - networks: - - web - labels: - - "traefik.docker.network=web" - - "traefik.enable=true" - - "traefik.basic.frontend.rule=Host:coriolis.io,coriolis.edcd.io" - - "traefik.basic.port=80" - - "traefik.basic.protocol=http" - - develop: - image: edcd/coriolis:develop - build: - dockerfile: Dockerfile.dev - context: . - args: - branch: develop - restart: always - volumes: - - ./nginx.conf:/etc/nginx/nginx.conf - networks: - - web - labels: - - "traefik.docker.network=web" - - "traefik.enable=true" - - "traefik.basic.frontend.rule=Host:beta.coriolis.io,beta.coriolis.edcd.io" - - "traefik.basic.port=80" - - "traefik.basic.protocol=http" - -networks: - web: - external: true diff --git a/nginx.conf b/nginx.conf deleted file mode 100644 index 874aefa0..00000000 --- a/nginx.conf +++ /dev/null @@ -1,96 +0,0 @@ -worker_processes 1; -user nobody nobody; -error_log /tmp/error.log; -pid /tmp/nginx.pid; - -events { - - worker_connections 1024; -} - -http { - - include /etc/nginx/mime.types; - default_type application/octet-stream; - sendfile on; - client_body_temp_path /tmp/client_body; - fastcgi_temp_path /tmp/fastcgi_temp; - proxy_temp_path /tmp/proxy_temp; - scgi_temp_path /tmp/scgi_temp; - uwsgi_temp_path /tmp/uwsgi_temp; - access_log /tmp/access.log; - error_log /tmp/error.log; - - # https://nginx.org/en/docs/http/ngx_http_gzip_module.html - # Enable gzip compression. - # Default: off - gzip off; - - # Compression level (1-9). - # 5 is a perfect compromise between size and CPU usage, offering about - # 75% reduction for most ASCII files (almost identical to level 9). - # Default: 1 - gzip_comp_level 5; - - # Don't compress anything that's already small and unlikely to shrink much - # if at all (the default is 20 bytes, which is bad as that usually leads to - # larger files after gzipping). - # Default: 20 - gzip_min_length 256; - - # Compress data even for clients that are connecting to us via proxies, - # identified by the "Via" header (required for CloudFront). - # Default: off - gzip_proxied any; - - # Tell proxies to cache both the gzipped and regular version of a resource - # whenever the client's Accept-Encoding capabilities header varies; - # Avoids the issue where a non-gzip capable client (which is extremely rare - # today) would display gibberish if their proxy gave them the gzipped version. - # Default: off - gzip_vary on; - - # Compress all output labeled with one of the following MIME-types. - # text/html is always compressed by gzip module. - # Default: text/html - gzip_types *; - brotli on; - # brotli_static on; - brotli_types *; - # This should be turned on if you are going to have pre-compressed copies (.gz) of - # static files available. If not it should be left off as it will cause extra I/O - # for the check. It is best if you enable this in a location{} block for - # a specific directory, or on an individual server{} level. - # gzip_static on; - keepalive_timeout 3000; - server { - listen 80; - listen [::]:80; - index index.html; - server_name localhost; - root /usr/share/nginx/html; - autoindex on; - - location ~* \.(?:manifest|appcache|html?|xml|json|css|js|map|jpg|jpeg|gif|png|ico|svg|eot|ttf|woff|woff2)$ { - add_header Access-Control-Allow-Origin *; - add_header Access-Control-Allow-Credentials true; - add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS'; - add_header Access-Control-Allow-Headers 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type'; - access_log off; - } - location /service-worker.js { - expires -1; - add_header Access-Control-Allow-Origin *; - add_header Access-Control-Allow-Credentials true; - add_header Access-Control-Allow-Methods 'GET, POST, OPTIONS'; - add_header Access-Control-Allow-Headers 'DNT,X-CustomHeader,Keep-Alive,User-Agent,X-Requested-With,If-Modified-Since,Cache-Control,Content-Type'; - access_log off; - } - location / { - try_files $uri $uri/ /index.html =404; - } - location /iframe.html { - try_files $uri $uri/ /iframe.html =404; - } - } -}