Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 8ca2add

Browse files
authored
chore(dogfood): revert to pre-artifactory state (#12169)
1 parent 97e4d51 commit 8ca2add

File tree

2 files changed

+1
-28
lines changed

2 files changed

+1
-28
lines changed

.github/workflows/dogfood.yaml

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -109,8 +109,7 @@ jobs:
109109
- name: "Push template"
110110
if: github.ref == 'refs/heads/main'
111111
run: |
112-
./coder templates push $CODER_TEMPLATE_NAME --directory $CODER_TEMPLATE_DIR --yes --name=$CODER_TEMPLATE_VERSION --message="$CODER_TEMPLATE_MESSAGE" --variable jfrog_url=${{ secrets.JFROG_URL }}
113-
env:
112+
./coder templates push $CODER_TEMPLATE_NAME --directory $CODER_TEMPLATE_DIR --yes --name=$CODER_TEMPLATE_VERSION --message="$CODER_TEMPLATE_MESSAGE"
114113
# Consumed by Coder CLI
115114
CODER_URL: https://dev.coder.com
116115
CODER_SESSION_TOKEN: ${{ secrets.CODER_SESSION_TOKEN }}

dogfood/main.tf

Lines changed: 0 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -10,16 +10,6 @@ terraform {
1010
}
1111
}
1212

13-
variable "jfrog_url" {
14-
type = string
15-
description = "Artifactory URL. e.g. https://myartifactory.example.com"
16-
# ensue the URL is HTTPS or HTTP
17-
validation {
18-
condition = can(regex("^(https|http)://", var.jfrog_url))
19-
error_message = "jfrog_url must be a valid URL starting with either 'https://' or 'http://'"
20-
}
21-
}
22-
2313
locals {
2414
// These are cluster service addresses mapped to Tailscale nodes. Ask Dean or
2515
// Kyle for help.
@@ -34,7 +24,6 @@ locals {
3424
repo_base_dir = data.coder_parameter.repo_base_dir.value == "~" ? "/home/coder" : replace(data.coder_parameter.repo_base_dir.value, "/^~\\//", "/home/coder/")
3525
repo_dir = replace(module.git-clone.repo_dir, "/^~\\//", "/home/coder/")
3626
container_name = "coder-${data.coder_workspace.me.owner}-${lower(data.coder_workspace.me.name)}"
37-
jfrog_host = replace(var.jfrog_url, "https://", "")
3827
}
3928

4029
data "coder_parameter" "repo_base_dir" {
@@ -157,21 +146,6 @@ module "coder-login" {
157146
agent_id = coder_agent.dev.id
158147
}
159148

160-
module "jfrog" {
161-
source = "registry.coder.com/modules/jfrog-oauth/coder"
162-
version = "1.0.2"
163-
agent_id = coder_agent.dev.id
164-
jfrog_url = var.jfrog_url
165-
configure_code_server = true
166-
username_field = "username"
167-
package_managers = {
168-
"npm" : "npm",
169-
"go" : "go",
170-
"pypi" : "pypi",
171-
"docker" : "docker"
172-
}
173-
}
174-
175149
resource "coder_agent" "dev" {
176150
arch = "amd64"
177151
os = "linux"

0 commit comments

Comments
 (0)