浏览代码

Merge branch 'master' of ssh://gogs.dezendorf.net:2222/breandan/monorepo

Breandan Dezendorf 2 年之前
父节点
当前提交
0edac9b528

+ 1 - 1
dezendorf/homelab/k3s/codeserver/codeserver.yaml

@@ -17,7 +17,7 @@ spec:
     spec:
       containers:
       - name: codeserver
-        image: docker.dezendorf.net/code-server:latest
+        image: docker.dezendorf.net/code-server:37a2073
         ports:
         - name: web
           containerPort: 8080

+ 0 - 2
dezendorf/homelab/k3s/pihole/pihole.yaml

@@ -21,7 +21,6 @@ spec:
       dnsPolicy: ClusterFirstWithHostNet
       dnsConfig:
         nameservers:
-          - 192.168.1.9
           - 8.8.8.8
         searches:
           - dezendorf.net
@@ -215,7 +214,6 @@ data:
     192.168.1.151 thin1.dezendorf.net
     192.168.1.152 thin2.dezendorf.net
     192.168.1.153 thin3.dezendorf.net
-    192.168.1.87 docker.dezendorf.net
     192.168.1.87 sso.dezendorf.net
     192.168.1.87 argocd.dezendorf.net
     192.168.1.87 auth.dezendorf.net

+ 2 - 2
docker/codeserver/Dockerfile

@@ -2,7 +2,7 @@ FROM codercom/code-server:latest
 
 RUN sudo apt update -y && sudo apt upgrade -y
 
-RUN sudo apt install -y npm htop golang docker
+RUN sudo apt install -y npm htop golang docker dnsutils
 RUN sudo npm install -g @bazel/bazelisk 
 
-COPY resolv.conf /etc/resolv.conf
+COPY resolv.conf /etc/resolv.conf

+ 13 - 3
docker/codeserver/build.sh

@@ -1,5 +1,15 @@
 TAG=$(git rev-parse --short HEAD)
+NAME="docker.dezendorf.net/code-server"
+YAML="../../dezendorf/homelab/k3s/codeserver/codeserver.yaml"
+docker build -t ${NAME}:${TAG} . < Dockerfile
+docker push ${NAME}:${TAG}
+docker push ${NAME}:latest
+
+echo "Built and pushed:"
+echo "  ${NAME}:${TAG}"
+echo "  ${NAME}:latest"
+
+sed -i -e "s#$NAME:.*#$NAME:$TAG#g" ${YAML}
+git add ${YAML}
+
 
-docker build -t docker.dezendorf.net/code-server:${TAG} . < Dockerfile
-docker push docker.dezendorf.net/code-server:${TAG}
-docker push docker.dezendorf.net/code-server:latest