Fix error

streamnative · Apr 30, 2024 · 98afad2 · 98afad2
1 parent 476623a
commit 98afad2
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 9 deletions.
diff --git a/.github/workflows/test-function-runner.yml b/.github/workflows/test-function-runner.yml
@@ -62,21 +62,42 @@ jobs:
       - name: Run Trivy vulnerability scanner for java
         uses: aquasecurity/trivy-action@master
         with:
-          image-ref: 'localhost:5000/pulsar-functions-java-runner:3.2.2.1'
+          image-ref: 'pulsar-functions-java-runner:3.2.2.1'
           format: 'table'
           exit-code: '1'
 
       - name: Run Trivy vulnerability scanner for python
         uses: aquasecurity/trivy-action@master
         with:
-          image-ref: 'localhost:5000/pulsar-functions-python-runner:3.2.2.1'
+          image-ref: 'pulsar-functions-python-runner:3.2.2.1'
           format: 'table'
           exit-code: '1'
 
       - name: Run Trivy vulnerability scanner for go
         uses: aquasecurity/trivy-action@master
         with:
-          image-ref: 'localhost:5000/pulsar-functions-go-runner:3.2.2.1'
+          image-ref: 'pulsar-functions-go-runner:3.2.2.1'
+          format: 'table'
+          exit-code: '1'
+
+      - name: Run Trivy vulnerability scanner for java with pulsarctl
+        uses: aquasecurity/trivy-action@master
+        with:
+          image-ref: 'pulsar-functions-pulsarctl-java-runner:3.2.2.1'
+          format: 'table'
+          exit-code: '1'
+
+      - name: Run Trivy vulnerability scanner for python with pulsarctl
+        uses: aquasecurity/trivy-action@master
+        with:
+          image-ref: 'pulsar-functions-pulsarctl-python-runner:3.2.2.1'
+          format: 'table'
+          exit-code: '1'
+
+      - name: Run Trivy vulnerability scanner for go with pulsarctl
+        uses: aquasecurity/trivy-action@master
+        with:
+          image-ref: 'pulsar-functions-pulsarctl-go-runner:3.2.2.1'
           format: 'table'
           exit-code: '1'
 

diff --git a/images/pulsar-functions-base-runner/Dockerfile b/images/pulsar-functions-base-runner/Dockerfile
@@ -7,7 +7,7 @@ ENV GID=10001
 ENV UID=10000
 ENV USER=pulsar
 RUN groupadd -g $GID pulsar
-RUN adduser -u $UID --gid $GID --disabled-login --disabled-password --gecos '' $USER
+RUN useradd -u $UID -G pulsar -N   $USER
 
 RUN mkdir -p /pulsar/bin/ \
     && mkdir -p /pulsar/lib/ \

diff --git a/images/pulsar-functions-base-runner/pulsarctl.Dockerfile b/images/pulsar-functions-base-runner/pulsarctl.Dockerfile
@@ -7,7 +7,7 @@ ENV GID=10001
 ENV UID=10000
 ENV USER=pulsar
 RUN groupadd -g $GID pulsar
-RUN adduser -u $UID --gid $GID --disabled-login --disabled-password --gecos '' $USER
+RUN useradd -u $UID -G pulsar -N   $USER
 
 RUN mkdir -p /pulsar/bin/ \
     && mkdir -p /pulsar/lib/ \

diff --git a/images/pulsar-functions-python-runner/Dockerfile b/images/pulsar-functions-python-runner/Dockerfile
@@ -21,8 +21,7 @@ RUN if [ -d "/tmp/pulsar/cpp-client" ]; then mv /tmp/pulsar/cpp-client /pulsar/c
 # Install some utilities
 RUN apt-get update \
      && DEBIAN_FRONTEND=noninteractive apt-get install -y python3 python3-dev python3-setuptools python3-yaml python3-kazoo \
-                 libreadline-gplv2-dev libncursesw5-dev libssl-dev libsqlite3-dev tk-dev libgdbm-dev libc6-dev libbz2-dev \
-                 curl ca-certificates\
+                 libncursesw5-dev libssl-dev libsqlite3-dev tk-dev libgdbm-dev libc6-dev libbz2-dev curl ca-certificates\
      && apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/apt/lists/*
 
 RUN mkdir -p /etc/pki/tls/certs && cp /etc/ssl/certs/ca-certificates.crt /etc/pki/tls/certs/ca-bundle.crt

diff --git a/images/pulsar-functions-python-runner/pulsarctl.Dockerfile b/images/pulsar-functions-python-runner/pulsarctl.Dockerfile
@@ -19,8 +19,7 @@ COPY --from=pulsar --chown=$UID:$GID /pulsar/README /pulsar/cpp-clien* /pulsar/c
 
 RUN apt-get update \
      && DEBIAN_FRONTEND=noninteractive apt-get install -y python3 python3-dev python3-setuptools python3-yaml python3-kazoo \
-                 libreadline-gplv2-dev libncursesw5-dev libssl-dev libsqlite3-dev tk-dev libgdbm-dev libc6-dev libbz2-dev \
-                 curl ca-certificates\
+                 libncursesw5-dev libssl-dev libsqlite3-dev tk-dev libgdbm-dev libc6-dev libbz2-dev curl ca-certificates\
      && apt-get clean autoclean && apt-get autoremove --yes && rm -rf /var/lib/apt/lists/* \
      && mkdir -p /etc/pki/tls/certs && cp /etc/ssl/certs/ca-certificates.crt /etc/pki/tls/certs/ca-bundle.crt \
      && update-alternatives --install /usr/bin/python python /usr/bin/python3 10 \