From cbb8522f448819be7391b61e665562556fb21db9 Mon Sep 17 00:00:00 2001 From: Mikael Finstad Date: Fri, 10 Dec 2021 00:12:09 +0700 Subject: [PATCH] @uppy/companion: fix Dockerfile and deploy automation (#3355) * attempt at fixing dockerfile that works with yarn workspaces and respects yarn.lock * run corepack yarn * update Dockerfile references * remove unneccesary yarn plugin import * Apply suggestions from code review Co-authored-by: Antoine du Hamel Co-authored-by: Antoine du Hamel --- .dockerignore | 1 - Dockerfile | 35 ----------------------------------- Dockerfile.test | 15 --------------- docker-compose-dev.yml | 19 ------------------- docker-compose-test.yml | 8 -------- docker-compose.yml | 15 --------------- infra/kube/gcloud-deploy.sh | 2 +- package.json | 3 +++ 8 files changed, 4 insertions(+), 94 deletions(-) delete mode 100644 .dockerignore delete mode 100644 Dockerfile delete mode 100644 Dockerfile.test delete mode 100644 docker-compose-dev.yml delete mode 100644 docker-compose-test.yml delete mode 100644 docker-compose.yml diff --git a/.dockerignore b/.dockerignore deleted file mode 100644 index b512c09d47..0000000000 --- a/.dockerignore +++ /dev/null @@ -1 +0,0 @@ -node_modules \ No newline at end of file diff --git a/Dockerfile b/Dockerfile deleted file mode 100644 index 69cf3ce93f..0000000000 --- a/Dockerfile +++ /dev/null @@ -1,35 +0,0 @@ -FROM node:16.13.0-alpine as build - -COPY package.json /app/package.json - -WORKDIR /app - -# Install node_modules -# * to optionally copy lock files that _might_ _not_ exist -ADD package.json package-*.json yarn.* /tmp/ -RUN cd /tmp && apk --update add --virtual native-dep \ - make gcc g++ python3 libgcc libstdc++ git && \ - corepack yarn install && \ - apk del native-dep -RUN mkdir -p /app && cd /app && ln -nfs /tmp/node_modules -RUN apk add bash -COPY . /app -ENV PATH "${PATH}:/app/node_modules/.bin" -RUN corepack yarn run build - -FROM node:16.13.0-alpine - -RUN mkdir -p /app -WORKDIR /app - -# copy required files from build stage. -COPY --from=build /app/bin /app/bin -COPY --from=build /app/lib /app/lib -COPY --from=build /app/package.json /app/package.json -COPY --from=build /tmp/node_modules /app/node_modules - -ENV PATH "${PATH}:/app/node_modules/.bin" - -CMD ["node","/app/bin/companion"] -# This can be overruled later -EXPOSE 3020 diff --git a/Dockerfile.test b/Dockerfile.test deleted file mode 100644 index c8e7963748..0000000000 --- a/Dockerfile.test +++ /dev/null @@ -1,15 +0,0 @@ -FROM node:16.13.0-alpine - -COPY package.json /app/package.json - -WORKDIR /app - -RUN apk --update add --virtual native-dep \ - make gcc g++ python3 libgcc libstdc++ git && \ - corepack yarn install && \ - apk del native-dep -RUN apk add bash - -COPY . /app -RUN npm install -g nodemon -CMD ["npm","test"] diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml deleted file mode 100644 index 2e6f20226e..0000000000 --- a/docker-compose-dev.yml +++ /dev/null @@ -1,19 +0,0 @@ -version: '3.9' - -services: - uppy: - image: transloadit/companion - build: - context: . - dockerfile: Dockerfile - environment: - - NODE_ENV=development - volumes: - - ./:/app - - /app/node_modules - - /mnt/uppy-server-data:/mnt/uppy-server-data - ports: - - "3020:3020" - command: "/app/src/standalone/start-server.js --config nodemon.json" - env_file: - - .env diff --git a/docker-compose-test.yml b/docker-compose-test.yml deleted file mode 100644 index d27b3d8385..0000000000 --- a/docker-compose-test.yml +++ /dev/null @@ -1,8 +0,0 @@ -version: '3.9' - -services: - uppy: - image: companion - build: - context: . - dockerfile: Dockerfile.test diff --git a/docker-compose.yml b/docker-compose.yml deleted file mode 100644 index 3dbf23a12a..0000000000 --- a/docker-compose.yml +++ /dev/null @@ -1,15 +0,0 @@ -version: '3.9' - -services: - uppy: - image: transloadit/companion - build: - context: . - dockerfile: Dockerfile - volumes: - - /app/node_modules - - /mnt/uppy-server-data:/mnt/uppy-server-data - ports: - - "3020:3020" - env_file: - - .env diff --git a/infra/kube/gcloud-deploy.sh b/infra/kube/gcloud-deploy.sh index f648a74a9a..345297a2f1 100755 --- a/infra/kube/gcloud-deploy.sh +++ b/infra/kube/gcloud-deploy.sh @@ -17,7 +17,7 @@ mv ./kubectl ${HOME}/.local/bin/ # Store the new image in docker hub -docker build -t transloadit/companion:latest -t transloadit/companion:$TRAVIS_COMMIT -f packages/@uppy/companion/Dockerfile packages/@uppy/companion; +docker build -t transloadit/companion:latest -t transloadit/companion:$TRAVIS_COMMIT .; docker login -u="$DOCKER_USERNAME" -p="$DOCKER_PASSWORD"; # Push the commit tagged docker image. diff --git a/package.json b/package.json index 4fbfaf9fe9..20f077e016 100644 --- a/package.json +++ b/package.json @@ -114,5 +114,8 @@ }, "engines": { "node": ">=10.20.1" + }, + "installConfig": { + "hoistingLimits": "workspaces" } }