docker-reg-ui

apps/apt-cacher-ng/Dockerfile

@@ -3,7 +3,7 @@ FROM debian:stable-slim
 RUN sed -i 's@deb.debian.org@apt-cache.lan/deb.debian.org@g' /etc/apt/sources.list && \
 	sed -i 's@security.debian.org@apt-cache.lan/security.debian.org@g' /etc/apt/sources.list && \
 	apt-get update && apt-get install -y \
-	apt-cacher-ng procps && \
+	apt-cacher-ng && \
 	apt-get clean -y && \ 
 	rm -rf /var/lib/apt/lists/* && \
 	rm -rf /var/cache/apt/*

apps/distcc/Dockerfile

@@ -1,18 +1,15 @@
-FROM debian:buster-slim
+FROM debian:stable-slim
 
-RUN apt-get update && \
+RUN sed -i 's@deb.debian.org@apt-cache.lan/deb.debian.org@g' /etc/apt/sources.list && \
+	sed -i 's@security.debian.org@apt-cache.lan/security.debian.org@g' /etc/apt/sources.list && \
+	apt-get update && \
   	apt-get install -y \
-    multiarch-support \
-    dpkg-dev \
-    distcc ccache \
-    build-essential \
-    gcc \
-    cpp \
-    g++ \
-    clang \
-    llvm && \
+    gcc-arm-linux-gnueabihf gcc-arm-none-eabi gcc-aarch64-linux-gnu \
+    multiarch-support dpkg-dev distcc ccache \
+    build-essential gcc cpp g++ clang llvm && \
 	apt-get clean -y && \ 
-    rm -rf /var/lib/apt/lists/*
+	rm -rf /var/lib/apt/lists/* && \
+	rm -rf /var/cache/apt/*
 	
 # Op port
 EXPOSE 3632

apps/distcc/distcc-deployment.yaml

@@ -3,7 +3,7 @@ kind: Deployment
 metadata:
   labels:
     app: distcc
-    release: buster
+    release: stable
   name: distcc
   namespace: default
 spec:
@@ -17,11 +17,11 @@ spec:
     metadata:
       labels:
         app: distcc
-        release: buster
+        release: stable
     spec:
       containers:
       - name: distcc
-        image: docker-registry.lan/distcc:aarch64
+        image: cr.lan/distcc:aarch64
         imagePullPolicy: Always
 #env:
 #- name: OPTIONS
@@ -61,7 +61,7 @@ kind: Service
 metadata:
   labels:
     app: distcc
-    release: buster
+    release: stable
   namespace: default
   name: distcc
 spec:

apps/distcc/tekton-image-build.yaml

@@ -1,45 +1,42 @@
 apiVersion: tekton.dev/v1alpha1
 kind: PipelineResource
 metadata:
-  name: sinatra-hello-world-git
+  name: chaos-kubernetes-git
 spec:
   type: git
   params:
     - name: revision
-      value: main
+      value: master
     - name: url
-      value: https://github.com/BrianMMcClain/sinatra-hello-world
+      value: http://git-ui.lan/chaos/kubernetes.git
+    - name: submodules
+      value: "false"
 ---
 apiVersion: tekton.dev/v1alpha1
 kind: PipelineResource
 metadata:
-  name: sinatra-hello-world-tekton-demo-image
+  name: img-distcc
 spec:
   type: image
   params:
     - name: url
-      value: docker-registry.lan/sinatra-hello-world-tekton-demo
-    - name: 
+      value: cr.lan/distcc
 ---
 apiVersion: tekton.dev/v1beta1
 kind: Task
 metadata:
-  name: build-docker-image-from-git-source
+  name: build-distcc
 spec:
   params:
     - name: pathToDockerFile
       type: string
-      description: The path to the dockerfile to build
-      default: $(resources.inputs.docker-source.path)/Dockerfile
+      default: $(resources.inputs.source.path)/apps/distcc/Dockerfile
     - name: pathToContext
       type: string
-      description: |
-        The build context used by Kaniko
-        (https://github.com/GoogleContainerTools/kaniko#kaniko-build-contexts)
-      default: $(resources.inputs.docker-source.path)
+      default: $(resources.inputs.source.path)/apps/distcc
   resources:
     inputs:
-      - name: docker-source
+      - name: source
         type: git
     outputs:
       - name: builtImage
@@ -47,10 +44,6 @@ spec:
   steps:
     - name: build-and-push
       image: gcr.io/kaniko-project/executor:arm64
-      # specifying DOCKER_CONFIG is required to allow kaniko to detect docker credential
-      env:
-        - name: "DOCKER_CONFIG"
-          value: "/tekton/home/.docker/"
       command:
         - /kaniko/executor
       args:
@@ -62,20 +55,22 @@ spec:
 apiVersion: tekton.dev/v1beta1
 kind: TaskRun
 metadata:
-  name: build-docker-image-from-git-source-task-run
+  name: img-distcc-taskrun
 spec:
   #serviceAccountName: dockerhub-service
   taskRef:
-    name: build-docker-image-from-git-source
+    name: build-distcc
   params:
     - name: pathToDockerFile
       value: Dockerfile
   resources:
     inputs:
-      - name: docker-source
+      - name: source
         resourceRef:
-          name: sinatra-hello-world-git
+          name: chaos-kubernetes-git
     outputs:
       - name: builtImage
         resourceRef:
-          name: sinatra-hello-world-tekton-demo-image
+          name: img-distcc
+          
+          

apps/docker-registry/docker-registry-ui.yaml

@@ -23,16 +23,16 @@ spec:
           image: "cr.lan/docker-registry-ui:arm64"
           imagePullPolicy: Always
           env:
-            - name: URL
-              value: "http://cr.lan"
+            #- name: URL
+            #  value: "https://cr.lan"
             - name: REGISTRY_TITLE
               value: "cReg"
             - name: DELETE_IMAGES
               value: "true"
-            #- name: REGISTRY_URL
-            #  value: "http://docker-registry.lan"
-            - name: PULL_URL
+            - name: REGISTRY_URL
               value: "https://cr.lan"
+            #- name: PULL_URL
+            #  value: "https://cr.lan"
           ports:
             - name: http
               containerPort: 80
@@ -74,6 +74,10 @@ apiVersion: networking.k8s.io/v1beta1
 kind: Ingress
 metadata:
     name: docker-registry-ui
+    annotations:
+      nginx.ingress.kubernetes.io/enable-cors: "true"
+      nginx.ingress.kubernetes.io/cors-allow-origin: "http://cr-ui.lan"
+      nginx.ingress.kubernetes.io/cors-expose-headers: "*"
 spec:
     rules:
     - host: cr-ui.lan