From 7f58b72c8ef248c387cd9d0d4fdc507fc6c50835 Mon Sep 17 00:00:00 2001 From: Simon Haas Date: Fri, 4 Dec 2020 20:50:20 +0000 Subject: [PATCH 1/2] added docker --- docker-compose.yml | 12 ++++++++++++ docker/grunt/Dockerfile | 5 +++++ docker/web/Dockerfile | 3 +++ package-lock.json | 14 ++++++++++++-- 4 files changed, 32 insertions(+), 2 deletions(-) create mode 100644 docker-compose.yml create mode 100644 docker/grunt/Dockerfile create mode 100644 docker/web/Dockerfile diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 00000000..08865096 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,12 @@ +version: "3.6" +services: + web: + build: + context: . + dockerfile: ./docker/web/Dockerfile + container_name: cyberchef_nginx + restart: always + ports: + - 8080:80 + volumes: + - ./build/prod:/usr/share/nginx/html \ No newline at end of file diff --git a/docker/grunt/Dockerfile b/docker/grunt/Dockerfile new file mode 100644 index 00000000..27abc2f4 --- /dev/null +++ b/docker/grunt/Dockerfile @@ -0,0 +1,5 @@ +FROM node:10 + +RUN npm install -g grunt-cli + +EXPOSE 8080 \ No newline at end of file diff --git a/docker/web/Dockerfile b/docker/web/Dockerfile new file mode 100644 index 00000000..83a4a356 --- /dev/null +++ b/docker/web/Dockerfile @@ -0,0 +1,3 @@ + FROM nginx + + COPY ./build/prod /usr/share/nginx/html diff --git a/package-lock.json b/package-lock.json index 61c05f2c..5ede14d1 100644 --- a/package-lock.json +++ b/package-lock.json @@ -8750,7 +8750,8 @@ "version": "2.1.1", "resolved": "https://registry.npmjs.org/ms/-/ms-2.1.1.tgz", "integrity": "sha512-tgp+dl5cGk28utYktBsrFqA7HKgrhgPsg6Z/EfhWI4gl1Hwq8B/GmY/0oXZ6nF8hDVesS/FpnYaD/kOWhYQvyg==", - "dev": true + "dev": true, + "optional": true }, "p-limit": { "version": "2.3.0", @@ -13306,6 +13307,7 @@ "resolved": "https://registry.npmjs.org/braces/-/braces-2.3.2.tgz", "integrity": "sha512-aNdbnj9P8PjdXU4ybaWLK2IF3jc/EoDYbC7AazW6to3TRsfXxscC9UXOB5iDiEQrkyIbWp2SLQda4+QAa7nc3w==", "dev": true, + "optional": true, "requires": { "arr-flatten": "^1.1.0", "array-unique": "^0.3.2", @@ -13324,6 +13326,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, + "optional": true, "requires": { "is-extendable": "^0.1.0" } @@ -13356,6 +13359,7 @@ "resolved": "https://registry.npmjs.org/fill-range/-/fill-range-4.0.0.tgz", "integrity": "sha1-1USBHUKPmOsGpj3EAtJAPDKMOPc=", "dev": true, + "optional": true, "requires": { "extend-shallow": "^2.0.1", "is-number": "^3.0.0", @@ -13368,6 +13372,7 @@ "resolved": "https://registry.npmjs.org/extend-shallow/-/extend-shallow-2.0.1.tgz", "integrity": "sha1-Ua99YUrZqfYQ6huvu5idaxxWiQ8=", "dev": true, + "optional": true, "requires": { "is-extendable": "^0.1.0" } @@ -13422,13 +13427,15 @@ "version": "1.1.6", "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-1.1.6.tgz", "integrity": "sha512-NcdALwpXkTm5Zvvbk7owOUSvVvBKDgKP5/ewfXEznmQFfs4ZRmanOeKBTjRVjka3QFoN6XJ+9F3USqfHqTaU5w==", - "dev": true + "dev": true, + "optional": true }, "is-number": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/is-number/-/is-number-3.0.0.tgz", "integrity": "sha1-JP1iAaR4LPUFYcgQJ2r8fRLXEZU=", "dev": true, + "optional": true, "requires": { "kind-of": "^3.0.2" }, @@ -13438,6 +13445,7 @@ "resolved": "https://registry.npmjs.org/kind-of/-/kind-of-3.2.2.tgz", "integrity": "sha1-MeohpzS6ubuw8yRm2JOupR5KPGQ=", "dev": true, + "optional": true, "requires": { "is-buffer": "^1.1.5" } @@ -13449,6 +13457,7 @@ "resolved": "https://registry.npmjs.org/micromatch/-/micromatch-3.1.10.tgz", "integrity": "sha512-MWikgl9n9M3w+bpsY3He8L+w9eF9338xRl8IAO5viDizwSzziFEyUzo2xrrloB64ADbTf8uA8vRqqttDTOmccg==", "dev": true, + "optional": true, "requires": { "arr-diff": "^4.0.0", "array-unique": "^0.3.2", @@ -13482,6 +13491,7 @@ "resolved": "https://registry.npmjs.org/to-regex-range/-/to-regex-range-2.1.1.tgz", "integrity": "sha1-fIDBe53+vlmeJzZ+DU3VWQFB2zg=", "dev": true, + "optional": true, "requires": { "is-number": "^3.0.0", "repeat-string": "^1.6.1" From 3ba855502fd073248182685bf0c661485673835f Mon Sep 17 00:00:00 2001 From: Simon Haas Date: Fri, 4 Dec 2020 20:55:18 +0000 Subject: [PATCH 2/2] added new line and renamed container --- docker-compose.yml | 4 ++-- docker/grunt/Dockerfile | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/docker-compose.yml b/docker-compose.yml index 08865096..786ecb23 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -4,9 +4,9 @@ services: build: context: . dockerfile: ./docker/web/Dockerfile - container_name: cyberchef_nginx + container_name: cyberchef restart: always ports: - 8080:80 volumes: - - ./build/prod:/usr/share/nginx/html \ No newline at end of file + - ./build/prod:/usr/share/nginx/html diff --git a/docker/grunt/Dockerfile b/docker/grunt/Dockerfile index 27abc2f4..80c7594c 100644 --- a/docker/grunt/Dockerfile +++ b/docker/grunt/Dockerfile @@ -2,4 +2,4 @@ FROM node:10 RUN npm install -g grunt-cli -EXPOSE 8080 \ No newline at end of file +EXPOSE 8080