Updated dockerfiles for snapshot images

.goreleaser.yml

@@ -144,6 +144,9 @@ dockers:
     extra_files:
       - dist/osctrl-admin-linux-amd64
       - dist/osctrl-admin-linux-arm64
+      - cmd/admin/templates
+      - cmd/admin/static
+      - deploy/osquery/data
 
   - image_templates:
       - "{{ .Env.DOCKER_HUB_ORG }}/osctrl-api:{{ .Version }}"

deploy/cicd/docker/Dockerfile-osctrl-admin

@@ -4,28 +4,28 @@ ARG COMPONENT=admin
 ARG GOOS=linux
 ARG GOARCH=amd64
 
-# Install software
 RUN apt-get update -y -q && \
+    apt-get install -y -q --no-install-recommends ca-certificates && \
     rm -rf /var/lib/apt/lists/*
 
-# Install/Setup osctrl
 RUN useradd -ms /usr/sbin/nologin osctrl-${COMPONENT}
-RUN mkdir -p /opt/osctrl/bin && \
-    mkdir -p /opt/osctrl/config && \
-    mkdir -p /opt/osctrl/script && \
-    mkdir -p /opt/osctrl/tmpl_admin/components && \
-    mkdir -p /opt/osctrl/static && \
-    mkdir -p /opt/osctrl/data && \
-    chown osctrl-${COMPONENT}:osctrl-${COMPONENT} -R /opt/osctrl
+RUN mkdir -p /opt/osctrl/bin \
+    /opt/osctrl/config \
+    /opt/osctrl/tmpl_admin/components \
+    /opt/osctrl/static \
+    /opt/osctrl/data \
+    /opt/osctrl/carved_files && \
+    chown -R osctrl-${COMPONENT}:osctrl-${COMPONENT} /opt/osctrl
+
 COPY osctrl-${COMPONENT}-${GOOS}-${GOARCH} /opt/osctrl/bin/osctrl-${COMPONENT}
-RUN chmod 755 /opt/osctrl/bin/osctrl-${COMPONENT}
+RUN chmod 0755 /opt/osctrl/bin/osctrl-${COMPONENT}
 
-### Copy osctrl-admin web templates ###
-USER osctrl-${COMPONENT}
-COPY cmd/admin/templates/ /opt/osctrl/tmpl_admin
-COPY cmd/admin/static/ /opt/osctrl/static
-COPY deploy/osquery/data/*.json /opt/osctrl/data/
+# GoReleaser extra_files provides these paths in the docker build context.
+COPY templates/ /opt/osctrl/tmpl_admin
+COPY static/ /opt/osctrl/static
+COPY data/*.json /opt/osctrl/data/
 
+USER osctrl-${COMPONENT}
 WORKDIR /opt/osctrl
 EXPOSE 9001/tcp
 CMD ["/opt/osctrl/bin/osctrl-admin"]

deploy/cicd/docker/Dockerfile-osctrl-api

@@ -4,18 +4,18 @@ ARG COMPONENT=api
 ARG GOOS=linux
 ARG GOARCH=amd64
 
-# Install software
 RUN apt-get update -y -q && \
+    apt-get install -y -q --no-install-recommends ca-certificates && \
     rm -rf /var/lib/apt/lists/*
 
-# Install/Setup osctrl
 RUN useradd -ms /usr/sbin/nologin osctrl-${COMPONENT}
-RUN mkdir -p /opt/osctrl/bin && \
-    mkdir -p /opt/osctrl/config && \
-    mkdir -p /opt/osctrl/script && \
-    chown osctrl-${COMPONENT}:osctrl-${COMPONENT} -R /opt/osctrl
+RUN mkdir -p /opt/osctrl/bin \
+    /opt/osctrl/config && \
+    chown -R osctrl-${COMPONENT}:osctrl-${COMPONENT} /opt/osctrl
+
 COPY osctrl-${COMPONENT}-${GOOS}-${GOARCH} /opt/osctrl/bin/osctrl-${COMPONENT}
-RUN chmod 755 /opt/osctrl/bin/osctrl-${COMPONENT}
+RUN chmod 0755 /opt/osctrl/bin/osctrl-${COMPONENT}
+
 USER osctrl-${COMPONENT}
 WORKDIR /opt/osctrl
 EXPOSE 9002/tcp

deploy/cicd/docker/Dockerfile-osctrl-cli

@@ -4,24 +4,18 @@ ARG COMPONENT=cli
 ARG GOOS=linux
 ARG GOARCH=amd64
 
-# Install software
 RUN apt-get update -y -q && \
+    apt-get install -y -q --no-install-recommends ca-certificates bash && \
     rm -rf /var/lib/apt/lists/*
 
-# Install/Setup osctrl
 RUN useradd -ms /usr/sbin/nologin osctrl-${COMPONENT}
-RUN mkdir -p /opt/osctrl/bin && \
-    mkdir -p /opt/osctrl/config && \
-    mkdir -p /opt/osctrl/script && \
-    chown osctrl-${COMPONENT}:osctrl-${COMPONENT} -R /opt/osctrl
+RUN mkdir -p /opt/osctrl/bin \
+    /opt/osctrl/config && \
+    chown -R osctrl-${COMPONENT}:osctrl-${COMPONENT} /opt/osctrl
 
 COPY osctrl-${COMPONENT}-${GOOS}-${GOARCH} /opt/osctrl/bin/osctrl-${COMPONENT}
-RUN chmod 755 /opt/osctrl/bin/osctrl-${COMPONENT}
-
-
-COPY deploy/docker/conf/cli/entrypoint.sh /entrypoint.sh
-RUN chmod 755 /entrypoint.sh
+RUN chmod 0755 /opt/osctrl/bin/osctrl-${COMPONENT}
 
 USER osctrl-${COMPONENT}
 WORKDIR /opt/osctrl
-ENTRYPOINT [ "/entrypoint.sh" ]
+ENTRYPOINT ["/bin/bash"]

deploy/cicd/docker/Dockerfile-osctrl-tls

@@ -4,18 +4,19 @@ ARG COMPONENT=tls
 ARG GOOS=linux
 ARG GOARCH=amd64
 
-# Install software
+# Keep runtime image minimal while retaining CA certs and basic tooling.
 RUN apt-get update -y -q && \
+    apt-get install -y -q --no-install-recommends ca-certificates && \
     rm -rf /var/lib/apt/lists/*
 
-# Install/Setup osctrl
 RUN useradd -ms /usr/sbin/nologin osctrl-${COMPONENT}
-RUN mkdir -p /opt/osctrl/bin && \
-    mkdir -p /opt/osctrl/config && \
-    mkdir -p /opt/osctrl/script && \
-    chown osctrl-${COMPONENT}:osctrl-${COMPONENT} -R /opt/osctrl
+RUN mkdir -p /opt/osctrl/bin \
+    /opt/osctrl/config && \
+    chown -R osctrl-${COMPONENT}:osctrl-${COMPONENT} /opt/osctrl
+
 COPY osctrl-${COMPONENT}-${GOOS}-${GOARCH} /opt/osctrl/bin/osctrl-${COMPONENT}
-RUN chmod 755 /opt/osctrl/bin/osctrl-${COMPONENT}
+RUN chmod 0755 /opt/osctrl/bin/osctrl-${COMPONENT}
+
 USER osctrl-${COMPONENT}
 WORKDIR /opt/osctrl
 EXPOSE 9000/tcp