Rename cst to image-tester (#44)

Signed-off-by: Ilya Dmitrichenko <errordeveloper@gmail.com>

.github/workflows/images.yaml

@@ -29,6 +29,14 @@ jobs:
  with:
  entrypoint: make
  args: maker-image PUSH=true
+ - uses: docker://docker.io/cilium/image-maker:bc81755ec8f6c5afcb10a416cef73f99a35fee2c
+ name: Run make tester-image
+ env:
+ DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
+ DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
+ with:
+ entrypoint: make
+ args: tester-image PUSH=true
  - uses: docker://docker.io/cilium/image-maker:bc81755ec8f6c5afcb10a416cef73f99a35fee2c
  name: Run make compilers-image
  env:
@@ -85,11 +93,3 @@ jobs:
  with:
  entrypoint: make
  args: ca-certificates-image PUSH=true
- - uses: docker://docker.io/cilium/image-maker:bc81755ec8f6c5afcb10a416cef73f99a35fee2c
- name: Run make cst-image
- env:
- DOCKER_HUB_PASSWORD: ${{ secrets.DOCKER_HUB_PASSWORD }}
- DOCKER_HUB_USERNAME: ${{ secrets.DOCKER_HUB_USERNAME }}
- with:
- entrypoint: make
- args: cst-image PUSH=true

Makefile

@@ -31,6 +31,9 @@ maker-image: .buildx_builder
 update-maker-image:
  scripts/update-maker-image.sh $(firstword $(REGISTRIES))
 
+tester-image: .buildx_builder
+ TEST=true scripts/build-image.sh image-tester images/tester linux/amd64,linux/arm64 $(OUTPUT) "$$(cat .buildx_builder)" $(REGISTRIES)
+
 compilers-image: .buildx_builder
  scripts/build-image.sh image-compilers images/compilers linux/amd64 $(OUTPUT) "$$(cat .buildx_builder)" $(REGISTRIES)
 
@@ -51,6 +54,3 @@ ca-certificates-image: .buildx_builder
 
 startup-script-image: .buildx_builder
  scripts/build-image.sh startup-script images/startup-script linux/amd64,linux/arm64 $(OUTPUT) "$$(cat .buildx_builder)" $(REGISTRIES)
-
-cst-image: .buildx_builder
- TEST=true scripts/build-image.sh cst images/cst linux/amd64,linux/arm64 $(OUTPUT) "$$(cat .buildx_builder)" $(REGISTRIES)

README.md

@@ -45,9 +45,9 @@ and other dependencies.
 
 This image is a custom BPF-only distribution of LLVM.
 
-### [`images/cst`](images/cst/Dockerfile)
+### [`images/tester`](images/tester/Dockerfile)
 
-This image contains a [simple Go program](images/cst/main.go), which is a minimal version of [`container-structure-test`](https://github.com/GoogleContainerTools/container-structure-test).
+This image contains a [simple Go program](images/tester/cst/main.go), which is a minimal version of [`container-structure-test`](https://github.com/GoogleContainerTools/container-structure-test).
 It's adapted to run inside a container build context more easily then the original `container-structure-tests`.
 
 ## Usage

images/cst/Dockerfile → images/tester/Dockerfile

@@ -8,10 +8,10 @@ ARG ALPINE_BASE_IMAGE=docker.io/library/alpine:3.11@sha256:9a839e63dad54c3a6d183
 
 FROM --platform=linux/amd64 ${GOLANG_IMAGE} as go-builder
 
-COPY . /go/src/github.com/cilium/image-tools/images/cst
+COPY . /go/src/github.com/cilium/image-tools/images/tester
 RUN mkdir -p /out/linux/amd64/bin /out/linux/arm64/bin
 
-WORKDIR /go/src/github.com/cilium/image-tools/images/cst 
+WORKDIR /go/src/github.com/cilium/image-tools/images/tester/cst
 
 # hadolint ignore=SC2215
 RUN --mount=target=/root/.cache,type=cache --mount=target=/go/pkg/mod,type=cache \

images/cst/go.mod → images/tester/cst/go.mod

@@ -1,4 +1,4 @@
-module github.com/cilium/image-tools/images/cst
+module github.com/cilium/image-tools/images/tester/cst
 
 go 1.14