Browse Source

companion: install git so we can fetch tus-js-client fork (#1404)

Renée Kooi 6 năm trước cách đây
mục cha
commit
771baab716

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

@@ -8,7 +8,7 @@ WORKDIR /app
 # * to optionally copy lock files that _might_ _not_ exist
 # * to optionally copy lock files that _might_ _not_ exist
 ADD package.json package-*.json yarn.* /tmp/
 ADD package.json package-*.json yarn.* /tmp/
 RUN cd /tmp && apk --update add  --virtual native-dep \
 RUN cd /tmp && apk --update add  --virtual native-dep \
-  make gcc g++ python libgcc libstdc++ && \
+  make gcc g++ python libgcc libstdc++ git && \
   npm  install && \
   npm  install && \
   apk del native-dep
   apk del native-dep
 RUN mkdir -p /app && cd /app && ln -nfs /tmp/node_modules
 RUN mkdir -p /app && cd /app && ln -nfs /tmp/node_modules
@@ -18,4 +18,4 @@ ENV PATH "${PATH}:/app/node_modules/.bin"
 RUN npm run build
 RUN npm run build
 CMD ["node","/app/lib/standalone/start-server.js"]
 CMD ["node","/app/lib/standalone/start-server.js"]
 # This can be overruled later
 # This can be overruled later
-EXPOSE 3020
+EXPOSE 3020

+ 3 - 3
packages/@uppy/companion/Dockerfile.test

@@ -1,18 +1,18 @@
 FROM alpine:3.6
 FROM alpine:3.6
 
 
 RUN apk add --update nodejs \
 RUN apk add --update nodejs \
-	           nodejs-npm 
+	           nodejs-npm
 
 
 COPY package.json /app/package.json
 COPY package.json /app/package.json
 
 
 WORKDIR /app
 WORKDIR /app
 
 
 RUN apk --update add  --virtual native-dep \
 RUN apk --update add  --virtual native-dep \
-  make gcc g++ python libgcc libstdc++ && \
+  make gcc g++ python libgcc libstdc++ git && \
   npm  install && \
   npm  install && \
   apk del native-dep
   apk del native-dep
 RUN apk add bash
 RUN apk add bash
 
 
 COPY . /app
 COPY . /app
 RUN npm install -g nodemon
 RUN npm install -g nodemon
-CMD ["npm","test"]
+CMD ["npm","test"]