update workflow and template

matifali · matifali · commit de18d5e8ad74 · 2024-01-18T06:27:13.000+03:00
diff --git a/.github/workflows/dogfood.yaml b/.github/workflows/dogfood.yaml
@@ -45,7 +45,7 @@ jobs:
           username: ${{ secrets.DOCKERHUB_USERNAME }}
           password: ${{ secrets.DOCKERHUB_PASSWORD }}
 
-      - name: Build and push
+      - name: Build and push Non-Nix image
         uses: depot/build-push-action@v1
         with:
           project: b4q6ltmpzh
@@ -55,6 +55,17 @@ jobs:
           pull: true
           push: ${{ github.ref == 'refs/heads/main' }}
           tags: "codercom/oss-dogfood:${{ steps.docker-tag-name.outputs.tag }},codercom/oss-dogfood:latest"
+      
+      - name: Build and push Nix image
+        uses: depot/build-push-action@v1
+        with:
+          project: b4q6ltmpzh
+          token: ${{ secrets.DEPOT_TOKEN }}
+          buildx-fallback: true
+          context: "{{defaultContext}}:dogfood"
+          pull: true
+          push: ${{ github.ref == 'refs/heads/main' }}
+          tags: "codercom/oss-dogfood-nix:${{ steps.docker-tag-name.outputs.tag }},codercom/oss-dogfood-nix:latest"
 
   deploy_template:
     needs: build_image
diff --git a/dogfood/main.tf b/dogfood/main.tf
@@ -33,7 +33,6 @@ locals {
 
   repo_dir       = replace(data.coder_parameter.repo_dir.value, "/^~\\//", "/home/coder/")
   container_name = "coder-${data.coder_workspace.me.owner}-${lower(data.coder_workspace.me.name)}"
-  registry_name  = "codercom/oss-dogfood"
   jfrog_host     = replace(var.jfrog_url, "https://", "")
 }
 
@@ -45,20 +44,20 @@ data "coder_parameter" "repo_dir" {
   mutable     = true
 }
 
-data "coder_parameter" "image_tag" {
+data "coder_parameter" "image_type" {
   type = "string"
   name = "Coder Image"
-  default = "latest"
+  default = "codercom/oss-dogfood:latest"
   description = "The Docker image used to run your workspace. Choose between nix and non-nix images."
   option {
     icon  = "/icon/coder.svg"
     name  = "Non-Nix"
-    value = "latest"
+    value = "codercom/oss-dogfood:latest"
   }
   option {
     icon  = "/icons/nix.svg"
     name  = "Nix"
-    value = "nix"
+    value = "codercom/oss-dogfood-nix:latest"
   }
 }
 
@@ -296,7 +295,7 @@ resource "docker_volume" "home_volume" {
 }
 
 data "docker_registry_image" "dogfood" {
-  name = "${local.registry_name}:${data.coder_parameter.image_tag.value}"
+  name = "${data.coder_parameter.image_type.value}"
 }
 
 resource "docker_image" "dogfood" {

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,6 @@ locals {`
`33`	`33`
`34`	`34`	`repo_dir = replace(data.coder_parameter.repo_dir.value, "/^~\\//", "/home/coder/")`
`35`	`35`	`container_name = "coder-${data.coder_workspace.me.owner}-${lower(data.coder_workspace.me.name)}"`
`36`		`- registry_name = "codercom/oss-dogfood"`
`37`	`36`	`jfrog_host = replace(var.jfrog_url, "https://", "")`
`38`	`37`	`}`
`39`	`38`
`@@ -45,20 +44,20 @@ data "coder_parameter" "repo_dir" {`
`45`	`44`	`mutable = true`
`46`	`45`	`}`
`47`	`46`
`48`		`-data "coder_parameter" "image_tag" {`
	`47`	`+data "coder_parameter" "image_type" {`
`49`	`48`	`type = "string"`
`50`	`49`	`name = "Coder Image"`
`51`		`- default = "latest"`
	`50`	`+ default = "codercom/oss-dogfood:latest"`
`52`	`51`	`description = "The Docker image used to run your workspace. Choose between nix and non-nix images."`
`53`	`52`	`option {`
`54`	`53`	`icon = "/icon/coder.svg"`
`55`	`54`	`name = "Non-Nix"`
`56`		`- value = "latest"`
	`55`	`+ value = "codercom/oss-dogfood:latest"`
`57`	`56`	`}`
`58`	`57`	`option {`
`59`	`58`	`icon = "/icons/nix.svg"`
`60`	`59`	`name = "Nix"`
`61`		`- value = "nix"`
	`60`	`+ value = "codercom/oss-dogfood-nix:latest"`
`62`	`61`	`}`
`63`	`62`	`}`
`64`	`63`
`@@ -296,7 +295,7 @@ resource "docker_volume" "home_volume" {`
`296`	`295`	`}`
`297`	`296`
`298`	`297`	`data "docker_registry_image" "dogfood" {`
`299`		`- name = "${local.registry_name}:${data.coder_parameter.image_tag.value}"`
	`298`	`+ name = "${data.coder_parameter.image_type.value}"`
`300`	`299`	`}`
`301`	`300`
`302`	`301`	`resource "docker_image" "dogfood" {`