Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: linuxserver/docker-openvscode-server
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: main
Choose a base ref
...
head repository: linuxserver/docker-openvscode-server
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: insiders
Choose a head ref
Can’t automatically merge. Don’t worry, you can still create the pull request.
Loading
Showing with 1,626 additions and 984 deletions.
  1. +1 −1 .editorconfig
  2. +5 −5 .github/CONTRIBUTING.md
  3. +1 −1 .github/ISSUE_TEMPLATE/config.yml
  4. +0 −40 .github/ISSUE_TEMPLATE/issue.bug.md
  5. +76 −0 .github/ISSUE_TEMPLATE/issue.bug.yml
  6. +0 −25 .github/ISSUE_TEMPLATE/issue.feature.md
  7. +31 −0 .github/ISSUE_TEMPLATE/issue.feature.yml
  8. +1 −1 .github/PULL_REQUEST_TEMPLATE.md
  9. +16 −0 .github/workflows/call_issue_pr_tracker.yml
  10. +13 −0 .github/workflows/call_issues_cron.yml
  11. +102 −50 .github/workflows/external_trigger.yml
  12. +18 −16 .github/workflows/external_trigger_scheduler.yml
  13. +2 −2 .github/workflows/greetings.yml
  14. +0 −38 .github/workflows/package_trigger.yml
  15. +79 −29 .github/workflows/package_trigger_scheduler.yml
  16. +12 −0 .github/workflows/permissions.yml
  17. +0 −23 .github/workflows/stale.yml
  18. +7 −5 Dockerfile
  19. +7 −5 Dockerfile.aarch64
  20. +0 −47 Dockerfile.armhf
  21. +616 −392 Jenkinsfile
  22. +142 −61 README.md
  23. +6 −6 jenkins-vars.yml
  24. +380 −176 package_versions.txt
  25. +63 −19 readme-vars.yml
  26. 0 root/etc/s6-overlay/s6-rc.d/init-config-end/dependencies.d/init-opencode-server
  27. 0 root/etc/s6-overlay/s6-rc.d/init-opencode-server/dependencies.d/init-config
  28. +13 −17 root/etc/{cont-init.d/30-config → s6-overlay/s6-rc.d/init-opencode-server/run}
  29. +1 −0 root/etc/s6-overlay/s6-rc.d/init-opencode-server/type
  30. +1 −0 root/etc/s6-overlay/s6-rc.d/init-opencode-server/up
  31. 0 root/etc/s6-overlay/s6-rc.d/svc-opencode-server/dependencies.d/init-services
  32. +1 −0 root/etc/s6-overlay/s6-rc.d/svc-opencode-server/notification-fd
  33. +21 −0 root/etc/s6-overlay/s6-rc.d/svc-opencode-server/run
  34. +1 −0 root/etc/s6-overlay/s6-rc.d/svc-opencode-server/type
  35. 0 root/etc/s6-overlay/s6-rc.d/user/contents.d/init-opencode-server
  36. 0 root/etc/s6-overlay/s6-rc.d/user/contents.d/svc-opencode-server
  37. +0 −25 root/etc/services.d/openvscode-server/run
  38. +10 −0 root/usr/local/bin/install-extension
2 changes: 1 addition & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
@@ -15,6 +15,6 @@ trim_trailing_whitespace = false
indent_style = space
indent_size = 2

[{**.sh,root/etc/cont-init.d/**,root/etc/services.d/**}]
[{**.sh,root/etc/s6-overlay/s6-rc.d/**,root/etc/cont-init.d/**,root/etc/services.d/**}]
indent_style = space
indent_size = 4
10 changes: 5 additions & 5 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
* Read, and fill the Pull Request template
* If this is a fix for a typo (in code, documentation, or the README) please file an issue and let us sort it out. We do not need a PR
* If the PR is addressing an existing issue include, closes #\<issue number>, in the body of the PR commit message
* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://discord.gg/YWrKVTn)
* If you want to discuss changes, you can also bring it up in [#dev-talk](https://discordapp.com/channels/354974912613449730/757585807061155840) in our [Discord server](https://linuxserver.io/discord)

## Common files

@@ -24,7 +24,7 @@
## Readme

If you would like to change our readme, please __**do not**__ directly edit the readme, as it is auto-generated on each commit.
Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-openvscode-server/edit/main/readme-vars.yml).
Instead edit the [readme-vars.yml](https://github.com/linuxserver/docker-openvscode-server/edit/insiders/readme-vars.yml).

These variables are used in a template for our [Jenkins Builder](https://github.com/linuxserver/docker-jenkins-builder) as part of an ansible play.
Most of these variables are also carried over to [docs.linuxserver.io](https://docs.linuxserver.io/images/docker-openvscode-server)
@@ -105,17 +105,17 @@ docker build \
-t linuxserver/openvscode-server:latest .
```

The ARM variants can be built on x86_64 hardware using `multiarch/qemu-user-static`
The ARM variants can be built on x86_64 hardware and vice versa using `lscr.io/linuxserver/qemu-static`

```bash
docker run --rm --privileged multiarch/qemu-user-static:register --reset
docker run --rm --privileged lscr.io/linuxserver/qemu-static --reset
```

Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64`.

## Update the changelog

If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-openvscode-server/tree/main/root), add an entry to the changelog
If you are modifying the Dockerfiles or any of the startup scripts in [root](https://github.com/linuxserver/docker-openvscode-server/tree/insiders/root), add an entry to the changelog

```yml
changelogs:
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
blank_issues_enabled: false
contact_links:
- name: Discord chat support
url: https://discord.gg/YWrKVTn
url: https://linuxserver.io/discord
about: Realtime support / chat with the community and the team.

- name: Discourse discussion forum
40 changes: 0 additions & 40 deletions .github/ISSUE_TEMPLATE/issue.bug.md

This file was deleted.

76 changes: 76 additions & 0 deletions .github/ISSUE_TEMPLATE/issue.bug.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,76 @@
# Based on the issue template
name: Bug report
description: Create a report to help us improve
title: "[BUG] <title>"
labels: [Bug]
body:
- type: checkboxes
attributes:
label: Is there an existing issue for this?
description: Please search to see if an issue already exists for the bug you encountered.
options:
- label: I have searched the existing issues
required: true
- type: textarea
attributes:
label: Current Behavior
description: Tell us what happens instead of the expected behavior.
validations:
required: true
- type: textarea
attributes:
label: Expected Behavior
description: Tell us what should happen.
validations:
required: false
- type: textarea
attributes:
label: Steps To Reproduce
description: Steps to reproduce the behavior.
placeholder: |
1. In this environment...
2. With this config...
3. Run '...'
4. See error...
validations:
required: true
- type: textarea
attributes:
label: Environment
description: |
examples:
- **OS**: Ubuntu 20.04
- **How docker service was installed**: distro's packagemanager
value: |
- OS:
- How docker service was installed:
render: markdown
validations:
required: false
- type: dropdown
attributes:
label: CPU architecture
options:
- x86-64
- arm64
validations:
required: true
- type: textarea
attributes:
label: Docker creation
description: |
Command used to create docker container
Provide your docker create/run command or compose yaml snippet, or a screenshot of settings if using a gui to create the container
render: bash
validations:
required: true
- type: textarea
attributes:
description: |
Provide a full docker log, output of "docker logs openvscode-server"
label: Container logs
placeholder: |
Output of `docker logs openvscode-server`
render: bash
validations:
required: true
25 changes: 0 additions & 25 deletions .github/ISSUE_TEMPLATE/issue.feature.md

This file was deleted.

31 changes: 31 additions & 0 deletions .github/ISSUE_TEMPLATE/issue.feature.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
# Based on the issue template
name: Feature request
description: Suggest an idea for this project
title: "[FEAT] <title>"
labels: [enhancement]
body:
- type: checkboxes
attributes:
label: Is this a new feature request?
description: Please search to see if a feature request already exists.
options:
- label: I have searched the existing issues
required: true
- type: textarea
attributes:
label: Wanted change
description: Tell us what you want to happen.
validations:
required: true
- type: textarea
attributes:
label: Reason for change
description: Justify your request, why do you want it, what is the benefit.
validations:
required: true
- type: textarea
attributes:
label: Proposed code change
description: Do you have a potential code change in mind?
validations:
required: false
2 changes: 1 addition & 1 deletion .github/PULL_REQUEST_TEMPLATE.md
Original file line number Diff line number Diff line change
@@ -21,7 +21,7 @@

------------------------------

- [ ] I have read the [contributing](https://github.com/linuxserver/docker-openvscode-server/blob/main/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications
- [ ] I have read the [contributing](https://github.com/linuxserver/docker-openvscode-server/blob/insiders/.github/CONTRIBUTING.md) guideline and understand that I have made the correct modifications

------------------------------

16 changes: 16 additions & 0 deletions .github/workflows/call_issue_pr_tracker.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
name: Issue & PR Tracker

on:
issues:
types: [opened,reopened,labeled,unlabeled,closed]
pull_request_target:
types: [opened,reopened,review_requested,review_request_removed,labeled,unlabeled,closed]
pull_request_review:
types: [submitted,edited,dismissed]

jobs:
manage-project:
permissions:
issues: write
uses: linuxserver/github-workflows/.github/workflows/issue-pr-tracker.yml@v1
secrets: inherit
13 changes: 13 additions & 0 deletions .github/workflows/call_issues_cron.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
name: Mark stale issues and pull requests
on:
schedule:
- cron: '41 21 * * *'
workflow_dispatch:

jobs:
stale:
permissions:
issues: write
pull-requests: write
uses: linuxserver/github-workflows/.github/workflows/issues-cron.yml@v1
secrets: inherit
Loading