Parcourir la source

@uppy/companion: fix Dockerfiles (#3291)

* @uppy/companion: fix Dockerfiles

* Fix Docker building and deployments.

Co-authored-by: Abdelhadi Khiati <kiloreux@gmail.com>
Antoine du Hamel il y a 3 ans
Parent
commit
f7d15c77d3

+ 1 - 1
packages/@uppy/companion/Dockerfile

@@ -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

+ 2 - 6
packages/@uppy/companion/Dockerfile.test

@@ -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

+ 1 - 1
packages/@uppy/companion/docker-compose-dev.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: '3.9'
 
 services:
   uppy:

+ 1 - 1
packages/@uppy/companion/docker-compose-test.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: '3.9'
 
 services:
   uppy:

+ 1 - 1
packages/@uppy/companion/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '2'
+version: '3.9'
 
 services:
   uppy: