Skip to content

Commit

Permalink
Merge branch 'saltyorg:master' into linkwarden
Browse files Browse the repository at this point in the history
  • Loading branch information
RaneyDazed authored Jan 30, 2024
2 parents 37c8572 + 462f279 commit 169772d
Show file tree
Hide file tree
Showing 2 changed files with 19 additions and 19 deletions.
12 changes: 6 additions & 6 deletions .github/workflows/sandbox.yml
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,9 @@ jobs:
ansible-lint:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- uses: actions/setup-python@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'

Expand All @@ -33,7 +33,7 @@ jobs:
check-entries:
runs-on: ubuntu-22.04
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Check Missing Entries
run: ./scripts/check_missing_entries.sh
Expand All @@ -42,7 +42,7 @@ jobs:
runs-on: ubuntu-22.04
if: github.ref == 'refs/heads/master'
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- uses: BobAnkh/add-contributors@master
with:
REPO_NAME: 'saltyorg/Sandbox'
Expand All @@ -60,7 +60,7 @@ jobs:
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4
- id: set-matrix
run: echo "matrix={\"roles\":[$(awk '/# Apps Start/{flag=1;next}/# Apps End/{flag=0}flag' sandbox.yml | awk '!/#/' | awk -F'[][]' '{print $2}' | tr '\n' ',' | sed 's/,*$//' | awk -F',' '{ for( i=1; i<=NF; i++ ) print $i }' | awk '{ gsub(/ /,""); print }'| sort -u | awk -vORS=, '{ print $1 }' | sed 's/,$/\n/')]}" >> $GITHUB_OUTPUT

Expand All @@ -73,7 +73,7 @@ jobs:
fail-fast: false

steps:
- uses: actions/checkout@v3
- uses: actions/checkout@v4

- name: Install Dependencies
uses: nick-fields/retry@v2
Expand Down
26 changes: 13 additions & 13 deletions roles/code_server/defaults/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@ code_server_docker_image: "codercom/code-server:{{ code_server_docker_image_tag
code_server_docker_ports_defaults: []
code_server_docker_ports_custom: []
code_server_docker_ports: "{{ code_server_docker_ports_defaults
+ code_server_docker_ports_custom }}"
+ code_server_docker_ports_custom }}"

# Envs
code_server_docker_envs_default:
Expand All @@ -80,13 +80,13 @@ code_server_docker_envs_default:
DOCKER_USER: "{{ user.name }}"
code_server_docker_envs_custom: {}
code_server_docker_envs: "{{ code_server_docker_envs_default
| combine(code_server_docker_envs_custom) }}"
| combine(code_server_docker_envs_custom) }}"

# Commands
code_server_docker_commands_default: []
code_server_docker_commands_custom: []
code_server_docker_commands: "{{ code_server_docker_commands_default
+ code_server_docker_commands_custom }}"
+ code_server_docker_commands_custom }}"

# Volumes
code_server_docker_volumes_default:
Expand All @@ -96,27 +96,27 @@ code_server_docker_volumes_default:
- "{{ server_appdata_path }}:/host_opt"
code_server_docker_volumes_custom: []
code_server_docker_volumes: "{{ code_server_docker_volumes_default
+ code_server_docker_volumes_custom }}"
+ code_server_docker_volumes_custom }}"

# Devices
code_server_docker_devices_default: []
code_server_docker_devices_custom: []
code_server_docker_devices: "{{ code_server_docker_devices_default
+ code_server_docker_devices_custom }}"
+ code_server_docker_devices_custom }}"

# Hosts
code_server_docker_hosts_default: []
code_server_docker_hosts_custom: []
code_server_docker_hosts: "{{ docker_hosts_common
| combine(code_server_docker_hosts_default)
| combine(code_server_docker_hosts_custom) }}"
| combine(code_server_docker_hosts_default)
| combine(code_server_docker_hosts_custom) }}"

# Labels
code_server_docker_labels_default: {}
code_server_docker_labels_custom: {}
code_server_docker_labels: "{{ docker_labels_common
| combine(code_server_docker_labels_default)
| combine(code_server_docker_labels_custom) }}"
| combine(code_server_docker_labels_default)
| combine(code_server_docker_labels_custom) }}"

# Hostname
code_server_docker_hostname: "{{ code_server_name }}"
Expand All @@ -126,20 +126,20 @@ code_server_docker_networks_alias: "{{ code_server_name }}"
code_server_docker_networks_default: []
code_server_docker_networks_custom: []
code_server_docker_networks: "{{ docker_networks_common
+ code_server_docker_networks_default
+ code_server_docker_networks_custom }}"
+ code_server_docker_networks_default
+ code_server_docker_networks_custom }}"

# Capabilities
code_server_docker_capabilities_default: []
code_server_docker_capabilities_custom: []
code_server_docker_capabilities: "{{ code_server_docker_capabilities_default
+ code_server_docker_capabilities_custom }}"
+ code_server_docker_capabilities_custom }}"

# Security Opts
code_server_docker_security_opts_default: []
code_server_docker_security_opts_custom: []
code_server_docker_security_opts: "{{ code_server_docker_security_opts_default
+ code_server_docker_security_opts_custom }}"
+ code_server_docker_security_opts_custom }}"

# Restart Policy
code_server_docker_restart_policy: unless-stopped
Expand Down

0 comments on commit 169772d

Please sign in to comment.