chore(dogfood): revert to pre-artifactory state (#12169)

This commit is contained in:
Muhammad Atif Ali 2024-02-16 13:47:15 +03:00 committed by GitHub
parent 97e4d51953
commit 8ca2add6dc
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 1 additions and 28 deletions

View File

@ -109,8 +109,7 @@ jobs:
- name: "Push template"
if: github.ref == 'refs/heads/main'
run: |
./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 }}
env:
./coder templates push $CODER_TEMPLATE_NAME --directory $CODER_TEMPLATE_DIR --yes --name=$CODER_TEMPLATE_VERSION --message="$CODER_TEMPLATE_MESSAGE"
# Consumed by Coder CLI
CODER_URL: https://dev.coder.com
CODER_SESSION_TOKEN: ${{ secrets.CODER_SESSION_TOKEN }}

View File

@ -10,16 +10,6 @@ terraform {
}
}
variable "jfrog_url" {
type = string
description = "Artifactory URL. e.g. https://myartifactory.example.com"
# ensue the URL is HTTPS or HTTP
validation {
condition = can(regex("^(https|http)://", var.jfrog_url))
error_message = "jfrog_url must be a valid URL starting with either 'https://' or 'http://'"
}
}
locals {
// These are cluster service addresses mapped to Tailscale nodes. Ask Dean or
// Kyle for help.
@ -34,7 +24,6 @@ locals {
repo_base_dir = data.coder_parameter.repo_base_dir.value == "~" ? "/home/coder" : replace(data.coder_parameter.repo_base_dir.value, "/^~\\//", "/home/coder/")
repo_dir = replace(module.git-clone.repo_dir, "/^~\\//", "/home/coder/")
container_name = "coder-${data.coder_workspace.me.owner}-${lower(data.coder_workspace.me.name)}"
jfrog_host = replace(var.jfrog_url, "https://", "")
}
data "coder_parameter" "repo_base_dir" {
@ -157,21 +146,6 @@ module "coder-login" {
agent_id = coder_agent.dev.id
}
module "jfrog" {
source = "registry.coder.com/modules/jfrog-oauth/coder"
version = "1.0.2"
agent_id = coder_agent.dev.id
jfrog_url = var.jfrog_url
configure_code_server = true
username_field = "username"
package_managers = {
"npm" : "npm",
"go" : "go",
"pypi" : "pypi",
"docker" : "docker"
}
}
resource "coder_agent" "dev" {
arch = "amd64"
os = "linux"