Merge pull request #3072 from simonbaird/add-conforma-executable-symlink

Add conforma executable symlink in container images

Author: simonbaird

Dockerfile

@@ -80,6 +80,9 @@ COPY hack/reduce-snapshot.sh /usr/local/bin
 # OpenShift preflight check requires a license
 COPY --from=build /build/LICENSE /licenses/LICENSE
 
+# Make it possible to use the "conforma" command instead of "ec" if you prefer
+RUN ln -s /usr/local/bin/ec /usr/local/bin/conforma
+
 # OpenShift preflight check requires a non-root user
 USER 1001
 

Dockerfile.dist

@@ -81,6 +81,9 @@ COPY hack/reduce-snapshot.sh /usr/local/bin
 # OpenShift preflight check requires a license
 COPY --from=build /build/LICENSE /licenses/LICENSE
 
+# Make it possible to use the "conforma" command instead of "ec" if you prefer
+RUN ln -s /usr/local/bin/ec /usr/local/bin/conforma
+
 # OpenShift preflight check requires a non-root user
 USER 1001
 

Makefile

@@ -70,6 +70,10 @@ dist-container: clean
 	  --platform $(BUILD_LOCAL_PLATFORM) \
 	  --build-arg BUILD_SUFFIX=local \
 	  --build-arg BUILD_LIST=$(BUILD_LOCAL_ARCH) \
+	  --volume "$(GOCACHE_DIR)":/go/cache:Z \
+	  --volume "$(GOMODCACHE_DIR)":/go/mod:Z \
+	  --env GOCACHE=/go/cache \
+	  --env GOMODCACHE=/go/mod \
 	  .
 
 # For local debugging of the above