Merge pull request #27 from thefringeninja/fix-things

Fix Things

Author: thefringeninja

Dockerfile

@@ -9,7 +9,6 @@ RUN apk add libcurl --no-cache && \
     /root/.dotnet/tools/minver > .version
 
 FROM node:10.12.0-alpine AS build
-ARG MYGET_API_KEY
 
 WORKDIR /app
 
@@ -21,25 +20,29 @@ COPY . .
 
 COPY --from=version /src/.version ./
 
-RUN REACT_APP_CLIENT_VERSION=$(cat .version) yarn build && \
+RUN REACT_APP_CLIENT_VERSION=$(cat .version) \
     yarn build:dist && \
-    yarn cache clean
+    yarn cache clean && \
+    cp .version ./dist
 
-RUN echo "https://www.myget.org/F/sqlstreamstore/npm/:_authToken=${MYGET_API_KEY}" > .npmrc && \
-    echo "@sqlstreamstore:registry=https://www.myget.org/F/sqlstreamstore/npm/" >> .npmrc
+FROM build AS publish
+ARG MYGET_API_KEY
 
-RUN test -z "$MYGET_API_KEY" || \
-    yarn publish --new-version $(cat .version) --no-git-tag-version && \
-    echo "No API key found, skipping publishing..."
+RUN \
+    if [ -n "$MYGET_API_KEY" ] ;\
+        then echo "https://www.myget.org/F/sqlstreamstore/npm/:_authToken=${MYGET_API_KEY}" > .npmrc && \
+            echo "@sqlstreamstore:registry=https://www.myget.org/F/sqlstreamstore/npm/" >> .npmrc && \
+            yarn publish --new-version $(cat .version) --no-git-tag-version ;\
+        else echo "No API key found, skipping publishing..." ;\
+    fi
 
 FROM nginx:1.15.5-alpine AS runtime
 
-COPY ./nginx/nginx.conf /etc/nginx/nginx.conf
+WORKDIR /etc/nginx
 
-COPY ./nginx/mime.types /etc/nginx/mime.types
+COPY ./nginx/ ./
 
-COPY --from=build /app/build/ /var/www/
-COPY --from=version /src/.version /var/www
+COPY --from=publish /app/dist/ /var/www/
 
 EXPOSE 80
 

package.json

@@ -5,10 +5,11 @@
   "scripts": {
     "analyze": "source-map-explorer build/static/js/main.*",
     "start": "react-scripts-ts start",
-    "build": "prettier --list-different \"src/**/*.js\" \"src/**/*.ts\" \"src/**/*.tsx\" && tslint --project ./ && react-scripts-ts build",
-    "build:dist": "rm -rf dist && tsc --project tsconfig.publish.json && cp src/index.d.ts ./dist",
+    "build": "yarn lint && react-scripts-ts build",
+    "build:dist": "rm -rf dist && yarn lint && tsc --project tsconfig.publish.json && cp src/index.d.ts ./dist",
     "eject": "react-scripts-ts eject",
-    "format": "prettier --write \"src/**/*.js\" \"src/**/*.ts\" \"src/**/*.tsx\" && tslint --project ./ --fix"
+    "format": "prettier --write \"src/**/*.js\" \"src/**/*.ts\" \"src/**/*.tsx\" && tslint --project ./ --fix",
+    "lint": "prettier --list-different \"src/**/*.js\" \"src/**/*.ts\" \"src/**/*.tsx\" && tslint --project ./"
   },
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -63,7 +64,7 @@
     "uri-template": "1.0.1",
     "uuid": "3.3.2"
   },
-  "author": "thefringeninja <joao.paul@braganca.name>",
+  "author": "thefringeninja",
   "license": "MIT",
   "browserslist": [
     ">0.2%",