Build slim image

.github/workflows/build.yml

@@ -39,13 +39,13 @@ jobs:
           restore-keys: |
             ${{ runner.os }}-buildx
 
-      - name: Build and push base image
+      - name: Build and push slim image
         uses: docker/build-push-action@v4
         with:
           context: .
-          file: ./Dockerfile.base
+          file: ./packaging/slim/Dockerfile
           push: true
-          tags: ${{ secrets.DOCKER_USERNAME }}/pg-ferret:latest
+          tags: ${{ secrets.DOCKER_USERNAME }}/pg-ferret-slim:latest
           platforms: linux/arm64, linux/amd64
           cache-from: type=local,src=/tmp/.buildx-cache
           cache-to: type=local,dest=/tmp/.buildx-cache
@@ -54,7 +54,7 @@ jobs:
         uses: docker/build-push-action@v4
         with:
           context: .
-          file: ./Dockerfile.all-in-one
+          file: ./packaging/all-in-one/Dockerfile
           push: true
           tags: ${{ secrets.DOCKER_USERNAME }}/pg-ferret-all-in-one:latest
           platforms: linux/arm64, linux/amd64

README.md

@@ -72,14 +72,14 @@ The all-in-one image provides Grafana and Tempo built in, but if you have your o
 #### 1. Start the slim image
 
 ```sh
-docker pull cbellew/pg-ferret:latest &&
+docker pull cbellew/pg-ferret-slim:latest &&
 docker run -it \
   -e POSTGRES_DB=mydb \
   -e POSTGRES_USER=myuser \
   -e POSTGRES_PASSWORD=mypass \
   -e OTEL_TRACING_ENDPOINT=http://myoteltracingbackend:4317 \
   --privileged -p 5432:5432 \
-  cbellew/pg-ferret:latest
+  cbellew/pg-ferret-slim:latest
 ```
 
 #### 2. Wait a second and fire a test query

docker-compose.yml

@@ -9,7 +9,7 @@ services:
     depends_on:
       - tempo
     volumes:
-      - ./packaging/base/tempo-datasource.yaml:/etc/grafana/provisioning/datasources/tempo-datasource.yaml
+      - ./packaging/slim/tempo-datasource.yaml:/etc/grafana/provisioning/datasources/tempo-datasource.yaml
     environment:
       GF_AUTH_DISABLE_LOGIN_FORM: "true"
       GF_AUTH_ANONYMOUS_ENABLED: "true"
@@ -30,7 +30,7 @@ services:
   postgres:
     build:
       context: .
-      dockerfile: ./packaging/base/Dockerfile
+      dockerfile: ./packaging/slim/Dockerfile
     container_name: postgres
     environment:
       POSTGRES_DB: mydb

packaging/all-in-one/Dockerfile

@@ -1,4 +1,4 @@
-FROM cbellew/pg-ferret:latest
+FROM cbellew/pg-ferret-slim:latest
 
 WORKDIR /app
 

packaging/base/Dockerfile

@@ -33,7 +33,7 @@ FROM cbellew/pg-ferret-postgres-16:latest
 WORKDIR /app
 COPY --from=builder /app/target/release/userspace-collector /usr/local/bin/userspace-collector
 
-COPY /packaging/base/start.sh /usr/local/bin/start.sh
+COPY /packaging/slim/start.sh /usr/local/bin/start.sh
 RUN chmod +x /usr/local/bin/start.sh
 
 EXPOSE 5432