Skip to content

Commit

Permalink
chore: simplify devcontainer
Browse files Browse the repository at this point in the history
  • Loading branch information
viceice committed Nov 30, 2023
1 parent c5134ce commit deeb95b
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 20 deletions.
13 changes: 1 addition & 12 deletions .devcontainer/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,18 +1,7 @@
FROM ghcr.io/containerbase/node:20.10.0
USER root

RUN install-apt make shellcheck

# renovate: datasource=github-releases packageName=containerbase/python-prebuild
RUN install-tool python 3.12.0
FROM ghcr.io/containerbase/devcontainer:9.26.0

# renovate: datasource=pypi
RUN install-tool pipenv 2023.11.15

# renovate: datasource=npm
RUN install-tool corepack 0.23.0

USER ubuntu

# https://github.com/parcel-bundler/parcel/issues/6569
ENV PARCEL_WORKER_BACKEND=process
15 changes: 9 additions & 6 deletions .devcontainer/devcontainer.json
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
{
"name": "Renovate",
"dockerFile": "Dockerfile",
"features": {
"ghcr.io/devcontainers/features/common-utils:2": {}
"build": {
"dockerfile": "Dockerfile"
},
"capAdd": ["SYS_PTRACE"],
"privileged": true,
"securityOpt": ["seccomp=unconfined"],
"customizations": {
"vscode": {
"terminal.integrated.profiles.linux": {
"bash": {
"path": "bash",
"icon": "terminal-bash"
}
},
"terminal.integrated.defaultProfile.linux": "bash",
"extensions": [
"esbenp.prettier-vscode",
"EditorConfig.editorconfig",
Expand Down
8 changes: 6 additions & 2 deletions .github/workflows/devcontainer.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
name: Devcontainer
name: devcontainer
on:
push:
branches:
- '**'
- '!main'
pull_request:
branches:
- main
Expand All @@ -12,7 +16,7 @@ on:
jobs:
devcontainer-test:
runs-on: ubuntu-latest
if: github.event.pull_request.draft != true
if: github.event_name != 'pull_request' || (github.repository_owner != github.event.pull_request.head.repo.owner.login && github.event.pull_request.draft != true)
steps:
- name: Checkout
uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
Expand Down

0 comments on commit deeb95b

Please sign in to comment.