Skip to content

Commit

Permalink
@uppy/companion: fix Dockerfiles (transloadit#3291)
Browse files Browse the repository at this point in the history
* @uppy/companion: fix Dockerfiles

* Fix Docker building and deployments.

Co-authored-by: Abdelhadi Khiati <kiloreux@gmail.com>
  • Loading branch information
aduh95 and kiloreux committed Nov 3, 2021
1 parent e424ff6 commit d9d0c61
Show file tree
Hide file tree
Showing 5 changed files with 6 additions and 10 deletions.
2 changes: 1 addition & 1 deletion Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ WORKDIR /app
# * to optionally copy lock files that _might_ _not_ exist
ADD package.json package-*.json yarn.* .yarn /tmp/
RUN cd /tmp && apk --update add --virtual native-dep \
make gcc g++ python libgcc libstdc++ git && \
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
Expand Down
8 changes: 2 additions & 6 deletions Dockerfile.test
Original file line number Diff line number Diff line change
@@ -1,15 +1,11 @@
FROM alpine:3.6

RUN apk add --update nodejs \
nodejs-npm
FROM node:16.13.0-alpine

COPY package.json /app/package.json

WORKDIR /app

RUN apk --update add --virtual native-dep \
make gcc g++ python libgcc libstdc++ git && \
npm install -g corepack && \
make gcc g++ python3 libgcc libstdc++ git && \
corepack yarn install && \
apk del native-dep
RUN apk add bash
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-dev.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: '3.9'

services:
uppy:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose-test.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: '3.9'

services:
uppy:
Expand Down
2 changes: 1 addition & 1 deletion docker-compose.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
version: '2'
version: '3.9'

services:
uppy:
Expand Down

0 comments on commit d9d0c61

Please sign in to comment.