iconv-factory docker fix

valasek · Jun 21, 2019 · da74afb · da74afb
1 parent f790c8c
commit da74afb
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 8 deletions.
diff --git a/.dockerignore b/.dockerignore
@@ -0,0 +1,2 @@
+# fix due to optipng-bin in icon-factory - https://github.com/imagemin/optipng-bin/issues/84
+./client/node_modules
diff --git a/Dockerfile b/Dockerfile
@@ -53,6 +53,8 @@ RUN GOOS=linux GOARCH=amd64 CGO_ENABLED=0 go build \
 ##############################################
 # Second stage: build the frontend executable.
 FROM node:lts-alpine AS frontend
+# fix due to optipng-bin in icon-factory - https://github.com/imagemin/optipng-bin/issues/84
+RUN apk --no-cache add pkgconfig autoconf automake libtool nasm build-base zlib-dev
 
 # make the 'client' folder the current working directory
 WORKDIR /client
@@ -62,9 +64,9 @@ COPY ./client/package*.json ./
 COPY ./client/ ./
 
 # install project dependencies
+RUN npm install
 RUN npm install -g @quasar/cli
 RUN quasar upgrade -i
-RUN npm install
 
 # copy project files and folders to the current working directory (i.e. 'app' folder)
 COPY ./client/ ./

diff --git a/client/package-lock.json b/client/package-lock.json
diff --git a/client/package.json b/client/package.json
@@ -27,7 +27,7 @@
   },
   "devDependencies": {
     "@quasar/app": "^1.0.0-rc.7",
-    "@quasar/quasar-app-extension-icon-factory": "^1.0.0-rc.5",
+    "@quasar/quasar-app-extension-icon-factory": "^1.0.0-rc.7",
     "@quasar/quasar-app-extension-qenv": "^1.0.0-beta.1",
     "@quasar/quasar-app-extension-qmarkdown": "^1.0.0-beta.12",
     "@quasar/quasar-app-extension-testing-quality": "^1.0.0-beta.8",
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		# fix due to optipng-bin in icon-factory - https://github.com/imagemin/optipng-bin/issues/84
		./client/node_modules