Update Dockerfile to work with the new changes in cli format (#171)

Author: nitisht

Dockerfile

@@ -16,21 +16,6 @@
 # Compile
 FROM    rust:1.63-alpine AS compiler
 
-RUN     apk add -q --update-cache --no-cache build-base openssl-dev
-
-# Create appuser
-ENV USER=parseable
-ENV UID=10001
-
-RUN adduser \
-    --disabled-password \
-    --gecos "" \
-    --home "/nonexistent" \
-    --shell "/sbin/nologin" \
-    --no-create-home \
-    --uid "${UID}" \
-    "${USER}"
-
 WORKDIR /parseable
 
 COPY . .
@@ -43,24 +28,31 @@ RUN     set -eux; \
         cargo build --release
 
 # Run
-FROM    alpine:3.14
+FROM    alpine:3.16
 
 RUN     apk update --quiet \
-        && apk add -q --no-cache libgcc curl
+        && apk add -q --no-cache tini
 
-# add parseable to the `/bin` so you can run it from anywhere and it's easy
-# to find.
-COPY    --from=compiler /etc/passwd /etc/passwd
-COPY    --from=compiler /etc/group /etc/group
+# Create appuser
+ENV USER=parseable
+ENV UID=10001
+
+RUN adduser \
+    --disabled-password \
+    --gecos "" \
+    --home "/nonexistent" \
+    --shell "/sbin/nologin" \
+    --no-create-home \
+    --uid "${UID}" \
+    "${USER}"
 
-# This directory should hold all the data related to parseable so we're going
-# to move our PWD in there.
 WORKDIR /parseable
 
 COPY    --from=compiler /parseable/target/release/parseable /bin/parseable
 
 USER parseable:parseable
 
 EXPOSE  8000/tcp
+ENTRYPOINT ["tini", "--"]
 
-CMD    ["/bin/parseable"]
+CMD    /bin/parseable

Dockerfile.release

@@ -13,11 +13,11 @@
 # You should have received a copy of the GNU Affero General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-FROM    alpine:3.14
+FROM    alpine:3.16
+
+RUN     apk update --quiet && \
+        apk add -q --no-cache tini
 
-RUN     apk update --quiet \
-        && apk add -q --no-cache libgcc curl
-        
 # Create appuser
 ENV USER=parseable
 ENV UID=10001
@@ -43,4 +43,5 @@ USER    parseable:parseable
 
 EXPOSE  8000/tcp
 
-CMD     ["/bin/parseable"]
+ENTRYPOINT ["tini", "--"]
+CMD     /bin/parseable

README.md

@@ -65,7 +65,8 @@ docker run \
   -p 8000:8000 \
   --env-file parseable-env \
   -v /tmp/data:/data \
-  parseable/parseable:latest
+  parseable/parseable:latest \
+  parseable server
 ```
 
 ### Kubernetes

helm/parseable/Chart.yaml

@@ -2,5 +2,5 @@ apiVersion: v2
 name: parseable
 description: Helm chart for Parseable Server
 type: application
-version: 0.0.2
-AppVersion: "v0.0.2"
+version: 0.0.5
+AppVersion: "v0.0.5"

helm/parseable/templates/deployment.yaml

@@ -31,6 +31,11 @@ spec:
             {{- toYaml .Values.parseable.securityContext | nindent 12 }}
           image: "{{ .Values.parseable.image.repository }}:{{ .Values.parseable.image.tag | default .Chart.AppVersion }}"
           imagePullPolicy: {{ .Values.parseable.image.pullPolicy }}
+          {{- if .Values.parseable.demo }}
+          args: ["parseable", "server", "--demo"]
+          {{- else }}
+          args: ["parseable", "server"]
+          {{- end }}
           env:
             {{- range $key, $value :=  .Values.parseable.env }}
             - name: {{ $key }}

helm/parseable/values.yaml

@@ -2,25 +2,24 @@ parseable:
   replicaCount: 1
   image:
     repository: parseable/parseable
-    tag: v0.0.2
+    tag: v0.0.5
     pullPolicy: IfNotPresent
   demo: true
   env:
-    P_ADDR: "0.0.0.0:8000"
-    P_TLS_CERT_PATH: ""
-    P_LOCAL_STORAGE: "data"
-    P_STORAGE_UPLOAD_INTERVAL: "60"
     RUST_LOG: "parseable=info"
-    # By default parseable uses demo environment. 
-    # Please change this before running in production.
-    P_S3_URL: ""
-    P_S3_ACCESS_KEY: ""
-    P_S3_SECRET_KEY: ""
-    P_S3_REGION: ""
-    P_S3_BUCKET: ""
-    P_LOCAL_STORAGE: ""
-    P_USERNAME: ""
-    P_PASSWORD: ""
+    # P_ADDR: "0.0.0.0:8000"
+    # P_TLS_CERT_PATH: ""
+    # P_TLS_KEY_PATH: ""
+    # P_LOCAL_STORAGE: "data"
+    # P_STORAGE_UPLOAD_INTERVAL: "60"
+    # P_S3_URL: ""
+    # P_S3_ACCESS_KEY: ""
+    # P_S3_SECRET_KEY: ""
+    # P_S3_REGION: ""
+    # P_S3_BUCKET: ""
+    # P_LOCAL_STORAGE: ""
+    # P_USERNAME: ""
+    # P_PASSWORD: ""
   nameOverride: ""
   fullnameOverride: ""  
   serviceAccount: