Skip to content

Commit

Permalink
Merge pull request #58 from blinklabs-io/feat/rename
Browse files Browse the repository at this point in the history
feat: rename from cloudstruct org
  • Loading branch information
wolf31o2 committed Jun 1, 2023
2 parents 9974bbf + 45713e3 commit 0cae0cf
Show file tree
Hide file tree
Showing 8 changed files with 817 additions and 700 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/ci-ansible.yml
Expand Up @@ -10,8 +10,8 @@ jobs:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
- run: 'echo "VM_TOKEN=foo" > .env'
- run: 'bash ./runme.sh'
- uses: ansible-community/ansible-lint-action@v6
with:
args: "ansible"
- run: 'echo "VM_TOKEN=foo" > .env'
- run: 'bash ./runme.sh'
2 changes: 1 addition & 1 deletion ansible/roles/vm_frontend/defaults/main.yml
@@ -1,5 +1,5 @@
---
redis_enabled: false
vm_frontend_version: 'main'
vm_frontend_image: 'ghcr.io/cloudstruct/vm-frontend:{{ vm_frontend_version }}'
vm_frontend_image: 'ghcr.io/blinklabs-io/cloudstruct-vm-frontend:{{ vm_frontend_version }}'
vm_frontend_port: 3000
2 changes: 1 addition & 1 deletion ansible/roles/vm_frontend/tasks/main.yml
Expand Up @@ -34,7 +34,7 @@
job: '/bin/sleep {{ 300 | random }}; {{ REPO }}/runme.sh > {{ REPO }}/logs/run-ansible.log 2>&1'
minute: '2,17,32,47'
hour: '*'
when: vm_frontend_version == 'master'
when: vm_frontend_version == 'main'

- name: Set net.core.rmem_max
ansible.posix.sysctl:
Expand Down
101 changes: 70 additions & 31 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions package.json
Expand Up @@ -9,13 +9,13 @@
},
"repository": {
"type": "git",
"url": "git+https://github.com/cloudstruct/vm-frontend.git"
"url": "git+https://github.com/blinklabs-io/cloudstruct-vm-frontend.git"
},
"license": "MIT",
"bugs": {
"url": "https://github.com/cloudstruct/vm-frontend/issues"
"url": "https://github.com/blinklabs-io/cloudstruct-vm-frontend/issues"
},
"homepage": "https://github.com/cloudstruct/vm-frontend#readme",
"homepage": "https://github.com/blinklabs-io/cloudstruct-vm-frontend#readme",
"devDependencies": {
"concurrently": "^7.1.0"
}
Expand Down
4 changes: 2 additions & 2 deletions runme.sh
Expand Up @@ -2,7 +2,7 @@

__repo=$(cd $(dirname ${BASH_SOURCE[0]}); pwd -P)

VM_BRANCH=${VM_BRANCH:-master}
VM_BRANCH=${VM_BRANCH:-main}

###
# Check for .env
Expand Down Expand Up @@ -86,6 +86,6 @@ ansible-playbook ${__repo}/ansible/local.yml \
set +e
# Find images from our repo tagged as <none> (orphaned layers)
echo "Cleaning up leftover Docker images"
docker images | grep '<none>' | grep 'ghcr.io/cloudstruct/vm-frontend' | awk '{print $3}' | xargs docker rmi &>/dev/null
docker images | grep '<none>' | grep 'ghcr.io/blinklabs-io/cloudstruct-vm-frontend' | awk '{print $3}' | xargs docker rmi &>/dev/null
# Don't exit w/ 1 if above fails
exit 0

0 comments on commit 0cae0cf

Please sign in to comment.