Skip to content

Commit

Permalink
@uppy/companion: fix Dockerfile and deploy automation (transloadit#3355)
Browse files Browse the repository at this point in the history
* 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 <duhamelantoine1995@gmail.com>

Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
  • Loading branch information
mifi and aduh95 committed Dec 9, 2021
1 parent 43883ae commit cbb8522
Show file tree
Hide file tree
Showing 8 changed files with 4 additions and 94 deletions.
1 change: 0 additions & 1 deletion .dockerignore

This file was deleted.

35 changes: 0 additions & 35 deletions Dockerfile

This file was deleted.

15 changes: 0 additions & 15 deletions Dockerfile.test

This file was deleted.

19 changes: 0 additions & 19 deletions docker-compose-dev.yml

This file was deleted.

8 changes: 0 additions & 8 deletions docker-compose-test.yml

This file was deleted.

15 changes: 0 additions & 15 deletions docker-compose.yml

This file was deleted.

2 changes: 1 addition & 1 deletion infra/kube/gcloud-deploy.sh
Expand Up @@ -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.
Expand Down
3 changes: 3 additions & 0 deletions package.json
Expand Up @@ -114,5 +114,8 @@
},
"engines": {
"node": ">=10.20.1"
},
"installConfig": {
"hoistingLimits": "workspaces"
}
}

0 comments on commit cbb8522

Please sign in to comment.