Allow Sync for non-root containers-hotreload example (#3680)

* Allow Sync for non-root containers-hotreload example

* Allow Sync for non-root containers-hotreload example - integration dir

* backporting #3683 changes for better examples

* integration files updates of hot-reload example

* newline at the end of file

* newline at the end of file

examples/hot-reload/k8s/node.yaml

@@ -22,6 +22,8 @@ spec:
       labels:
         app: node
     spec:
+      securityContext:
+        runAsUser: 1000
       containers:
       - name: node
         image: node-example

examples/hot-reload/k8s/python.yaml

@@ -22,6 +22,8 @@ spec:
       labels:
         app: python
     spec:
+      securityContext:
+        runAsUser: 1000
       containers:
       - name: python
         image: python-reload

examples/hot-reload/node/Dockerfile

@@ -1,9 +1,14 @@
-FROM node:10.15.3-alpine
+FROM node:12.16.0-alpine3.10
+
+USER node
+RUN mkdir /home/node/app
+WORKDIR /home/node/app
 
-WORKDIR /app
 EXPOSE 3000
-CMD ["npm", "run", "dev"]
+ARG ENV=production
+ENV NODE_ENV $ENV
+CMD npm run $NODE_ENV
 
-COPY package* ./
+COPY --chown=node:node package* ./
 RUN npm ci
-COPY src .
+COPY --chown=node:node . .

examples/hot-reload/node/package.json

@@ -2,9 +2,10 @@
   "name": "backend",
   "version": "1.0.0",
   "description": "",
-  "main": "index.js",
+  "main": "src/index.js",
   "scripts": {
-    "dev": "nodemon index.js"
+    "production": "node src/index.js",
+    "development": "nodemon src/index.js"
   },
   "dependencies": {
     "express": "^4.16.4"

examples/hot-reload/python/Dockerfile

@@ -1,9 +1,18 @@
 FROM python:3.7.4-alpine3.10
+
+RUN pip install --upgrade pip
+
+RUN adduser -D python
+USER python
+WORKDIR /home/python
+
+ARG DEBUG=0
+ENV FLASK_DEBUG $DEBUG
+ENV FLASK_APP=src/app.py
 CMD ["python", "-m", "flask", "run", "--host=0.0.0.0"]
-ENV FLASK_DEBUG=1
-ENV FLASK_APP=app.py
 
-COPY requirements.txt .
-RUN pip install -r requirements.txt
-COPY src ./
+COPY --chown=python:python requirements.txt .
+ENV PATH="/home/python/.local/bin:${PATH}"
+RUN pip install --user -r requirements.txt
 
+COPY --chown=python:python src src

examples/hot-reload/skaffold.yaml

@@ -4,11 +4,35 @@ build:
   artifacts:
   - image: node-example
     context: node
-    sync:
-      infer:
-      - 'src/**/*.js'
+
   - image: python-reload
     context: python
-    sync:
-      infer:
-      - 'src/**/*.py'
+
+profiles:
+  - name: dev
+    activation:
+      - command: dev
+    build:
+      artifacts:
+      - image: node-example
+        context: node
+        docker:
+          buildArgs:
+            ENV: development
+        sync:
+          manual:
+          # Sync all the javascript files that are in the src folder
+          # with the container src folder
+          - src: 'src/**/*.js'
+            dest: .
+      - image: python-reload
+        context: python
+        docker:
+          buildArgs:
+            DEBUG: 1
+        sync:
+          manual:
+          # Sync all the javascript files that are in the src folder
+          # with the container src folder
+          - src: 'src/**/*.py'
+            dest: .

integration/examples/hot-reload/k8s/node.yaml

@@ -22,6 +22,8 @@ spec:
       labels:
         app: node
     spec:
+      securityContext:
+        runAsUser: 1000
       containers:
       - name: node
         image: node-example

integration/examples/hot-reload/k8s/python.yaml

@@ -22,6 +22,8 @@ spec:
       labels:
         app: python
     spec:
+      securityContext:
+        runAsUser: 1000
       containers:
       - name: python
         image: python-reload

integration/examples/hot-reload/node/Dockerfile

@@ -1,9 +1,14 @@
-FROM node:10.15.3-alpine
+FROM node:12.16.0-alpine3.10
+
+USER node
+RUN mkdir /home/node/app
+WORKDIR /home/node/app
 
-WORKDIR /app
 EXPOSE 3000
-CMD ["npm", "run", "dev"]
+ARG ENV=production
+ENV NODE_ENV $ENV
+CMD npm run $NODE_ENV
 
-COPY package* ./
+COPY --chown=node:node package* ./
 RUN npm ci
-COPY src .
+COPY --chown=node:node . .

integration/examples/hot-reload/node/package.json

@@ -2,9 +2,10 @@
   "name": "backend",
   "version": "1.0.0",
   "description": "",
-  "main": "index.js",
+  "main": "src/index.js",
   "scripts": {
-    "dev": "nodemon index.js"
+    "production": "node src/index.js",
+    "development": "nodemon src/index.js"
   },
   "dependencies": {
     "express": "^4.16.4"

integration/examples/hot-reload/python/Dockerfile

@@ -1,9 +1,18 @@
 FROM python:3.7.4-alpine3.10
+
+RUN pip install --upgrade pip
+
+RUN adduser -D python
+USER python
+WORKDIR /home/python
+
+ARG DEBUG=0
+ENV FLASK_DEBUG $DEBUG
+ENV FLASK_APP=src/app.py
 CMD ["python", "-m", "flask", "run", "--host=0.0.0.0"]
-ENV FLASK_DEBUG=1
-ENV FLASK_APP=app.py
 
-COPY requirements.txt .
-RUN pip install -r requirements.txt
-COPY src ./
+COPY --chown=python:python requirements.txt .
+ENV PATH="/home/python/.local/bin:${PATH}"
+RUN pip install --user -r requirements.txt
 
+COPY --chown=python:python src src

integration/examples/hot-reload/skaffold.yaml

@@ -4,11 +4,35 @@ build:
   artifacts:
   - image: node-example
     context: node
-    sync:
-      infer:
-      - 'src/**/*.js'
+
   - image: python-reload
     context: python
-    sync:
-      infer:
-      - 'src/**/*.py'
+
+profiles:
+  - name: dev
+    activation:
+      - command: dev
+    build:
+      artifacts:
+      - image: node-example
+        context: node
+        docker:
+          buildArgs:
+            ENV: development
+        sync:
+          manual:
+          # Sync all the javascript files that are in the src folder
+          # with the container src folder
+          - src: 'src/**/*.js'
+            dest: .
+      - image: python-reload
+        context: python
+        docker:
+          buildArgs:
+            DEBUG: 1
+        sync:
+          manual:
+          # Sync all the javascript files that are in the src folder
+          # with the container src folder
+          - src: 'src/**/*.py'
+            dest: .