Skip to content

Commit

Permalink
Merge branch 'main' into multiuser-support
Browse files Browse the repository at this point in the history
  • Loading branch information
capsulecorplab committed Apr 9, 2024
2 parents ce2260b + 3f14a4a commit 65106ab
Show file tree
Hide file tree
Showing 4 changed files with 241 additions and 12 deletions.
17 changes: 13 additions & 4 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -56,15 +56,24 @@ jobs:
username: ${{ github.actor }}
password: ${{ secrets.GHCR_AUTH_TOKEN }}

- name: Workaround to free up 5GB of space # see https://github.com/actions/runner-images/issues/709#issuecomment-612569242
run: sudo rm -rf "/usr/local/share/boost" && sudo rm -rf "$AGENT_TOOLSDIRECTORY"

- name: Show disk usage
run: df -h

- name: Build image
uses: docker/build-push-action@v4.0.0
uses: docker/build-push-action@v5
with:
tags: ${{ steps.docker_meta.outputs.tags }}
file: ./Dockerfile


- name: Show disk usage
run: df -h

- name: Push image
uses: docker/build-push-action@v4.0.0
uses: docker/build-push-action@v5
with:
push: true
push: ${{ github.event_name != 'pull_request' }}
tags: ${{ steps.docker_meta.outputs.tags }}
file: ./Dockerfile
12 changes: 9 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,14 @@

This repo provides an Immutable-Infrastructure-as-Code (IIaC) workspace for the Mars Desert Research Station (MDRS), based on an Ansible template for [KASM Ubuntu Jammy](https://hub.docker.com/r/kasmweb/core-ubuntu-jammy) images. The workspace is configured with the following software:

- Node JS Tools
- nodejs v20.11.1
- npm v10.2.4 (included with nodejs)
- npx v10.2.4 (included with nodejs)
- yarn v3.5.0
- oclif v3.10.0
- [cli-njk](https://github.com/elcharitas/cli-njk) v1.0.0
- [ungit](https://github.com/FredrikNoren/ungit) 1.5.25
- git cli
- [Keychain](https://www.funtoo.org/Keychain)
- Firefox
Expand All @@ -25,8 +33,6 @@ This repo provides an Immutable-Infrastructure-as-Code (IIaC) workspace for the
- VS Code with the following extensions (note, auto-updates are disabled)
- [Python extension by Microsoft](https://marketplace.visualstudio.com/items?itemName=ms-python.python)
- [Dendron](https://marketplace.visualstudio.com/items?itemName=dendron.dendron)
- [Foam](https://marketplace.visualstudio.com/items?itemName=foam.foam-vscode)
- [GitLens](https://marketplace.visualstudio.com/items?itemName=eamodio.gitlens)
- Artifact Generators
- [PlantUML](https://plantuml.com/)
- JDK v11
Expand All @@ -35,7 +41,7 @@ This repo provides an Immutable-Infrastructure-as-Code (IIaC) workspace for the
- Open Source Hardware tools
- [PrusaSlicer](https://github.com/prusa3d/PrusaSlicer) 2.7.0
- [OpenSCAD](https://openscad.org/) 2021.01
- [FPrime (tools installed via fprime-workspace-image)](https://github.com/fprime-community/fprime-workspace-image) v3.4.0-rc1.1.0
- [FPrime (tools installed via fprime-workspace-image)](https://github.com/fprime-community/fprime-workspace-image) v3.4.0-1.1.0

## Requirements

Expand Down
Loading

0 comments on commit 65106ab

Please sign in to comment.