Skip to content

Commit a487f9a

Browse files
successbyfailuresuccessbyfailure
committed
Fix templates and add Android build
1 parent 041011a commit a487f9a

File tree

6 files changed

+100
-90
lines changed

6 files changed

+100
-90
lines changed

‎.github/workflows/build.yml‎

Lines changed: 12 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -148,21 +148,31 @@ jobs:
148148
include:
149149
- image_name: coder-mks-developer
150150
context: Docker-Images/Developer
151+
base_dep: desktop
151152
- image_name: coder-mks-design
152153
context: Docker-Images/Designer
154+
base_dep: desktop-kde
155+
- image_name: coder-mks-developer-android
156+
context: Docker-Images/DeveloperAndroid
157+
base_dep: desktop-kde
153158
steps:
154159
- name: Checkout
155160
uses: actions/checkout@v4
156161

157162
- name: Detect changes for image
158163
id: changes
159164
run: |
160-
# If desktop rebuilt, force dependent images to rebuild
161-
if [ "${{ needs.build-desktop.outputs.run_build }}" = "true" ]; then
165+
# If a base image rebuilt, force dependent images to rebuild
166+
if [ "${{ matrix.base_dep }}" = "desktop" ] && [ "${{ needs.build-desktop.outputs.run_build }}" = "true" ]; then
162167
echo "run_build=true" >> "$GITHUB_OUTPUT"
163168
echo "Desktop rebuilt; forcing build for ${{ matrix.image_name }}."
164169
exit 0
165170
fi
171+
if [ "${{ matrix.base_dep }}" = "desktop-kde" ] && [ "${{ needs.build-desktop-kde.outputs.run_build }}" = "true" ]; then
172+
echo "run_build=true" >> "$GITHUB_OUTPUT"
173+
echo "Desktop-KDE rebuilt; forcing build for ${{ matrix.image_name }}."
174+
exit 0
175+
fi
166176
167177
BASE_REF="${{ github.event.before }}"
168178
if [ -z "$BASE_REF" ] || ! git cat-file -e "$BASE_REF^{commit}" 2>/dev/null; then

‎workspaces/Designer/main.tf‎

Lines changed: 18 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ data "coder_parameter" "opencode_api_key" {
9898
}
9999

100100
locals {
101-
username = data.coder_workspace_owner.me.name
102-
workspace_image = "ghcr.io/makespacemadrid/coder-mks-design:latest"
103-
enable_gpu = data.coder_parameter.enable_gpu.value
104-
home_host_path = trimspace(data.coder_parameter.home_host_path.value)
105-
home_host_uid = trimspace(data.coder_parameter.home_host_uid.value)
106-
host_data_path = trimspace(data.coder_parameter.host_data_path.value)
101+
username = data.coder_workspace_owner.me.name
102+
workspace_image = "ghcr.io/makespacemadrid/coder-mks-design:latest"
103+
enable_gpu = data.coder_parameter.enable_gpu.value
104+
home_host_path = trimspace(data.coder_parameter.home_host_path.value)
105+
home_host_uid = trimspace(data.coder_parameter.home_host_uid.value)
106+
host_data_path = trimspace(data.coder_parameter.host_data_path.value)
107107
home_volume_existing = trimspace(data.coder_parameter.home_volume_existing.value)
108108
home_volume_name = trimspace(data.coder_parameter.home_volume_name.value)
109109
home_volume_resolved = coalesce(
@@ -203,8 +203,8 @@ PULSECFG
203203
#!/usr/bin/env bash
204204
set -euo pipefail
205205
KEY_ENDPOINT="https://prod8n.mksmad.org/webhook/94b9b71a-dc18-4c69-88d6-5b02100bf577"
206-
PROVIDER="${OPENCODE_PROVIDER_URL:-http://iapi.mksmad.org}"
207-
EMAIL="${CODER_USER_EMAIL:-}"
206+
PROVIDER="$${OPENCODE_PROVIDER_URL:-http://iapi.mksmad.org}"
207+
EMAIL="$${CODER_USER_EMAIL:-}"
208208
alias="coder-$(tr -dc 0-9 </dev/urandom 2>/dev/null | head -c 8 | sed 's/^$/00000000/')"
209209
if [ -z "$EMAIL" ]; then
210210
echo "Falta CODER_USER_EMAIL para solicitar la key" >&2
@@ -513,7 +513,7 @@ JSONCFG
513513
fi
514514
515515
# Wrapper ya no necesario
516-
EOT
516+
EOT
517517

518518
env = {
519519
GIT_AUTHOR_NAME = coalesce(data.coder_workspace_owner.me.full_name, data.coder_workspace_owner.me.name)
@@ -572,12 +572,12 @@ module "kasmvnc" {
572572
}
573573

574574
module "git-clone" {
575-
count = data.coder_parameter.git_repo_url.value != "" ? data.coder_workspace.me.start_count : 0
576-
source = "registry.coder.com/coder/git-clone/coder"
577-
version = "1.2.2"
578-
agent_id = coder_agent.main.id
579-
url = data.coder_parameter.git_repo_url.value
580-
base_dir = "~/projects"
575+
count = data.coder_parameter.git_repo_url.value != "" ? data.coder_workspace.me.start_count : 0
576+
source = "registry.coder.com/coder/git-clone/coder"
577+
version = "1.2.2"
578+
agent_id = coder_agent.main.id
579+
url = data.coder_parameter.git_repo_url.value
580+
base_dir = "~/projects"
581581
}
582582

583583
module "coder-login" {
@@ -657,9 +657,9 @@ resource "docker_container" "workspace" {
657657
add = ["SYS_ADMIN"]
658658
}
659659
devices {
660-
host_path = "/dev/fuse"
661-
container_path = "/dev/fuse"
662-
permissions = "rwm"
660+
host_path = "/dev/fuse"
661+
container_path = "/dev/fuse"
662+
permissions = "rwm"
663663
}
664664

665665
security_opts = ["apparmor:unconfined"]

‎workspaces/Developer/main.tf‎

Lines changed: 26 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -154,17 +154,17 @@ data "coder_parameter" "claude_token" {
154154
type = "string"
155155
default = ""
156156

157-
mutable = true
157+
mutable = true
158158
}
159159

160160
locals {
161-
username = data.coder_workspace_owner.me.name
162-
workspace_image = "ghcr.io/makespacemadrid/coder-mks-developer:latest"
163-
port_range = data.coder_parameter.expose_ports.value ? range(data.coder_parameter.port_range_start.value, data.coder_parameter.port_range_end.value + 1) : []
164-
enable_gpu = data.coder_parameter.enable_gpu.value
165-
home_host_path = trimspace(data.coder_parameter.home_host_path.value)
166-
home_host_uid = trimspace(data.coder_parameter.home_host_uid.value)
167-
host_data_path = trimspace(data.coder_parameter.host_data_path.value)
161+
username = data.coder_workspace_owner.me.name
162+
workspace_image = "ghcr.io/makespacemadrid/coder-mks-developer:latest"
163+
port_range = data.coder_parameter.expose_ports.value ? range(data.coder_parameter.port_range_start.value, data.coder_parameter.port_range_end.value + 1) : []
164+
enable_gpu = data.coder_parameter.enable_gpu.value
165+
home_host_path = trimspace(data.coder_parameter.home_host_path.value)
166+
home_host_uid = trimspace(data.coder_parameter.home_host_uid.value)
167+
host_data_path = trimspace(data.coder_parameter.host_data_path.value)
168168
home_volume_existing = trimspace(data.coder_parameter.home_volume_existing.value)
169169
home_volume_name = trimspace(data.coder_parameter.home_volume_name.value)
170170
home_volume_resolved = coalesce(
@@ -297,8 +297,8 @@ PULSECFG
297297
#!/usr/bin/env bash
298298
set -euo pipefail
299299
KEY_ENDPOINT="https://prod8n.mksmad.org/webhook/94b9b71a-dc18-4c69-88d6-5b02100bf577"
300-
PROVIDER="${OPENCODE_PROVIDER_URL:-http://iapi.mksmad.org}"
301-
EMAIL="${CODER_USER_EMAIL:-}"
300+
PROVIDER="$${OPENCODE_PROVIDER_URL:-http://iapi.mksmad.org}"
301+
EMAIL="$${CODER_USER_EMAIL:-}"
302302
alias="coder-$(tr -dc 0-9 </dev/urandom 2>/dev/null | head -c 8 | sed 's/^$/00000000/')"
303303
if [ -z "$EMAIL" ]; then
304304
echo "Falta CODER_USER_EMAIL para solicitar la key" >&2
@@ -667,11 +667,11 @@ JSONCFG
667667
EOT
668668

669669
env = {
670-
GIT_AUTHOR_NAME = coalesce(data.coder_workspace_owner.me.full_name, data.coder_workspace_owner.me.name)
671-
GIT_AUTHOR_EMAIL = data.coder_workspace_owner.me.email
672-
GIT_COMMITTER_NAME = coalesce(data.coder_workspace_owner.me.full_name, data.coder_workspace_owner.me.name)
673-
GIT_COMMITTER_EMAIL = data.coder_workspace_owner.me.email
674-
HOME = "/home/coder"
670+
GIT_AUTHOR_NAME = coalesce(data.coder_workspace_owner.me.full_name, data.coder_workspace_owner.me.name)
671+
GIT_AUTHOR_EMAIL = data.coder_workspace_owner.me.email
672+
GIT_COMMITTER_NAME = coalesce(data.coder_workspace_owner.me.full_name, data.coder_workspace_owner.me.name)
673+
GIT_COMMITTER_EMAIL = data.coder_workspace_owner.me.email
674+
HOME = "/home/coder"
675675
OPENCODE_PROVIDER_URL = data.coder_parameter.opencode_provider_url.value
676676
OPENCODE_API_KEY = data.coder_parameter.opencode_api_key.value
677677
CODER_USER_EMAIL = data.coder_workspace_owner.me.email
@@ -762,12 +762,12 @@ resource "coder_script" "setup_pipx" {
762762
}
763763

764764
module "code-server" {
765-
count = data.coder_workspace.me.start_count
766-
source = "registry.coder.com/coder/code-server/coder"
767-
version = "~> 1.0"
768-
agent_id = coder_agent.main.id
765+
count = data.coder_workspace.me.start_count
766+
source = "registry.coder.com/coder/code-server/coder"
767+
version = "~> 1.0"
768+
agent_id = coder_agent.main.id
769769
extensions = local.vscode_extensions
770-
order = 1
770+
order = 1
771771
}
772772

773773
module "git-config" {
@@ -778,12 +778,12 @@ module "git-config" {
778778
}
779779

780780
module "git-clone" {
781-
count = data.coder_parameter.git_repo_url.value != "" ? data.coder_workspace.me.start_count : 0
782-
source = "registry.coder.com/coder/git-clone/coder"
783-
version = "1.2.2"
784-
agent_id = coder_agent.main.id
785-
url = data.coder_parameter.git_repo_url.value
786-
base_dir = "~/projects"
781+
count = data.coder_parameter.git_repo_url.value != "" ? data.coder_workspace.me.start_count : 0
782+
source = "registry.coder.com/coder/git-clone/coder"
783+
version = "1.2.2"
784+
agent_id = coder_agent.main.id
785+
url = data.coder_parameter.git_repo_url.value
786+
base_dir = "~/projects"
787787
}
788788

789789
module "coder-login" {

‎workspaces/DeveloperAdvancedHost/main.tf‎

Lines changed: 21 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -89,11 +89,11 @@ data "coder_parameter" "opencode_api_key" {
8989
}
9090

9191
locals {
92-
username = data.coder_workspace_owner.me.name
93-
workspace_image = "ghcr.io/makespacemadrid/coder-mks-developer:latest"
94-
home_host_path = trimspace(data.coder_parameter.home_host_path.value)
95-
home_host_uid = trimspace(data.coder_parameter.home_host_uid.value)
96-
host_data_path = trimspace(data.coder_parameter.host_data_path.value)
92+
username = data.coder_workspace_owner.me.name
93+
workspace_image = "ghcr.io/makespacemadrid/coder-mks-developer:latest"
94+
home_host_path = trimspace(data.coder_parameter.home_host_path.value)
95+
home_host_uid = trimspace(data.coder_parameter.home_host_uid.value)
96+
host_data_path = trimspace(data.coder_parameter.host_data_path.value)
9797
home_volume_existing = trimspace(data.coder_parameter.home_volume_existing.value)
9898
home_volume_name = trimspace(data.coder_parameter.home_volume_name.value)
9999
home_volume_resolved = coalesce(
@@ -218,8 +218,8 @@ PULSECFG
218218
#!/usr/bin/env bash
219219
set -euo pipefail
220220
KEY_ENDPOINT="https://prod8n.mksmad.org/webhook/94b9b71a-dc18-4c69-88d6-5b02100bf577"
221-
PROVIDER="${OPENCODE_PROVIDER_URL:-http://iapi.mksmad.org}"
222-
EMAIL="${CODER_USER_EMAIL:-}"
221+
PROVIDER="$${OPENCODE_PROVIDER_URL:-http://iapi.mksmad.org}"
222+
EMAIL="$${CODER_USER_EMAIL:-}"
223223
alias="coder-$(tr -dc 0-9 </dev/urandom 2>/dev/null | head -c 8 | sed 's/^$/00000000/')"
224224
if [ -z "$EMAIL" ]; then
225225
echo "Falta CODER_USER_EMAIL para solicitar la key" >&2
@@ -625,12 +625,12 @@ JSONCFG
625625
# ---------------------------------------------------------------
626626

627627
module "code-server" {
628-
count = data.coder_workspace.me.start_count
629-
source = "registry.coder.com/coder/code-server/coder"
630-
version = "~> 1.0"
631-
agent_id = coder_agent.main.id
628+
count = data.coder_workspace.me.start_count
629+
source = "registry.coder.com/coder/code-server/coder"
630+
version = "~> 1.0"
631+
agent_id = coder_agent.main.id
632632
extensions = local.vscode_extensions
633-
order = 1
633+
order = 1
634634
}
635635

636636
module "git-config" {
@@ -641,12 +641,12 @@ module "git-config" {
641641
}
642642

643643
module "git-clone" {
644-
count = data.coder_parameter.git_repo_url.value != "" ? data.coder_workspace.me.start_count : 0
645-
source = "registry.coder.com/coder/git-clone/coder"
646-
version = "1.2.2"
647-
agent_id = coder_agent.main.id
648-
url = data.coder_parameter.git_repo_url.value
649-
base_dir = "~/projects"
644+
count = data.coder_parameter.git_repo_url.value != "" ? data.coder_workspace.me.start_count : 0
645+
source = "registry.coder.com/coder/git-clone/coder"
646+
version = "1.2.2"
647+
agent_id = coder_agent.main.id
648+
url = data.coder_parameter.git_repo_url.value
649+
base_dir = "~/projects"
650650
}
651651

652652
module "coder-login" {
@@ -779,9 +779,9 @@ resource "docker_container" "workspace" {
779779
add = ["SYS_ADMIN"]
780780
}
781781
devices {
782-
host_path = "/dev/fuse"
783-
container_path = "/dev/fuse"
784-
permissions = "rwm"
782+
host_path = "/dev/fuse"
783+
container_path = "/dev/fuse"
784+
permissions = "rwm"
785785
}
786786

787787
dynamic "volumes" {

‎workspaces/DeveloperAndroid/main.tf‎

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -98,12 +98,12 @@ data "coder_parameter" "opencode_api_key" {
9898
}
9999

100100
locals {
101-
username = data.coder_workspace_owner.me.name
102-
workspace_image = "ghcr.io/makespacemadrid/coder-mks-developer-android:latest"
103-
enable_gpu = data.coder_parameter.enable_gpu.value
104-
home_host_path = trimspace(data.coder_parameter.home_host_path.value)
105-
home_host_uid = trimspace(data.coder_parameter.home_host_uid.value)
106-
host_data_path = trimspace(data.coder_parameter.host_data_path.value)
101+
username = data.coder_workspace_owner.me.name
102+
workspace_image = "ghcr.io/makespacemadrid/coder-mks-developer-android:latest"
103+
enable_gpu = data.coder_parameter.enable_gpu.value
104+
home_host_path = trimspace(data.coder_parameter.home_host_path.value)
105+
home_host_uid = trimspace(data.coder_parameter.home_host_uid.value)
106+
host_data_path = trimspace(data.coder_parameter.host_data_path.value)
107107
home_volume_existing = trimspace(data.coder_parameter.home_volume_existing.value)
108108
home_volume_name = trimspace(data.coder_parameter.home_volume_name.value)
109109
home_volume_resolved = coalesce(
@@ -201,8 +201,8 @@ PULSECFG
201201
#!/usr/bin/env bash
202202
set -euo pipefail
203203
KEY_ENDPOINT="https://prod8n.mksmad.org/webhook/94b9b71a-dc18-4c69-88d6-5b02100bf577"
204-
PROVIDER="${OPENCODE_PROVIDER_URL:-http://iapi.mksmad.org}"
205-
EMAIL="${CODER_USER_EMAIL:-}"
204+
PROVIDER="$${OPENCODE_PROVIDER_URL:-http://iapi.mksmad.org}"
205+
EMAIL="$${CODER_USER_EMAIL:-}"
206206
alias="coder-$(tr -dc 0-9 </dev/urandom 2>/dev/null | head -c 8 | sed 's/^$/00000000/')"
207207
if [ -z "$EMAIL" ]; then
208208
echo "Falta CODER_USER_EMAIL para solicitar la key" >&2
@@ -566,12 +566,12 @@ module "git-config" {
566566
}
567567

568568
module "git-clone" {
569-
count = data.coder_parameter.git_repo_url.value != "" ? data.coder_workspace.me.start_count : 0
570-
source = "registry.coder.com/coder/git-clone/coder"
571-
version = "1.2.2"
572-
agent_id = coder_agent.main.id
573-
url = data.coder_parameter.git_repo_url.value
574-
base_dir = "~/projects"
569+
count = data.coder_parameter.git_repo_url.value != "" ? data.coder_workspace.me.start_count : 0
570+
source = "registry.coder.com/coder/git-clone/coder"
571+
version = "1.2.2"
572+
agent_id = coder_agent.main.id
573+
url = data.coder_parameter.git_repo_url.value
574+
base_dir = "~/projects"
575575
}
576576

577577
module "coder-login" {
@@ -666,9 +666,9 @@ resource "docker_container" "workspace" {
666666
add = ["SYS_ADMIN"]
667667
}
668668
devices {
669-
host_path = "/dev/fuse"
670-
container_path = "/dev/fuse"
671-
permissions = "rwm"
669+
host_path = "/dev/fuse"
670+
container_path = "/dev/fuse"
671+
permissions = "rwm"
672672
}
673673

674674
dynamic "volumes" {

‎workspaces/DeveloperBasic/main.tf‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,12 +121,12 @@ module "git-config" {
121121
}
122122

123123
module "git-clone" {
124-
count = data.coder_parameter.git_repo_url.value != "" ? data.coder_workspace.me.start_count : 0
125-
source = "registry.coder.com/coder/git-clone/coder"
126-
version = "1.2.2"
127-
agent_id = coder_agent.main.id
128-
url = data.coder_parameter.git_repo_url.value
129-
base_dir = "~/projects"
124+
count = data.coder_parameter.git_repo_url.value != "" ? data.coder_workspace.me.start_count : 0
125+
source = "registry.coder.com/coder/git-clone/coder"
126+
version = "1.2.2"
127+
agent_id = coder_agent.main.id
128+
url = data.coder_parameter.git_repo_url.value
129+
base_dir = "~/projects"
130130
}
131131

132132
resource "docker_volume" "home_volume" {

0 commit comments

Comments
 (0)