diff --git a/ci/images/centos7/Dockerfile b/ci/images/centos7/Dockerfile index cdcb384f..e057b93d 100644 --- a/ci/images/centos7/Dockerfile +++ b/ci/images/centos7/Dockerfile @@ -15,7 +15,6 @@ RUN npm config set python python2 RUN yum install -y epel-release && yum install -y jq RUN yum install -y rsync -# Copied from ../debian10/Dockerfile # Install Go. RUN ARCH="$(uname -m | sed 's/x86_64/amd64/; s/aarch64/arm64/')" && \ curl -fsSL "https://dl.google.com/go/go1.14.3.linux-$ARCH.tar.gz" | tar -C /usr/local -xz diff --git a/ci/images/debian10/Dockerfile b/ci/images/debian10/Dockerfile deleted file mode 100644 index 397316c2..00000000 --- a/ci/images/debian10/Dockerfile +++ /dev/null @@ -1,49 +0,0 @@ -FROM debian:10 - -RUN apt-get update - -# Needed for debian repositories added below. -RUN apt-get install -y curl gnupg - -# Installs node. -RUN curl -fsSL https://deb.nodesource.com/setup_12.x | bash - && \ - apt-get install -y nodejs - -# Installs yarn. -RUN curl -fsSL https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && \ - echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list && \ - apt-get update && apt-get install -y yarn - -# Installs VS Code build deps. -RUN apt-get install -y build-essential - -# Installs envsubst. -RUN apt-get install -y gettext-base - -# Misc build dependencies. -RUN apt-get install -y git rsync unzip jq - -# Installs shellcheck. -RUN curl -fsSL https://github.com/koalaman/shellcheck/releases/download/v0.7.1/shellcheck-v0.7.1.linux.$(uname -m).tar.xz | \ - tar -xJ && \ - mv shellcheck*/shellcheck /usr/local/bin && \ - rm -R shellcheck* - -# Install Go. -RUN ARCH="$(uname -m | sed 's/x86_64/amd64/; s/aarch64/arm64/')" && \ - curl -fsSL "https://dl.google.com/go/go1.14.3.linux-$ARCH.tar.gz" | tar -C /usr/local -xz -ENV GOPATH=/gopath -# Ensures running this image as another user works. -RUN mkdir -p $GOPATH && chmod -R 777 $GOPATH -ENV PATH=/usr/local/go/bin:$GOPATH/bin:$PATH - -# More stable than go get -RUN curl -sfL https://install.goreleaser.com/github.com/goreleaser/nfpm.sh | sh - -RUN VERSION="$(curl -fsSL https://storage.googleapis.com/kubernetes-release/release/stable.txt)" && \ - curl -fsSL "https://storage.googleapis.com/kubernetes-release/release/$VERSION/bin/linux/amd64/kubectl" > /usr/local/bin/kubectl \ - && chmod +x /usr/local/bin/kubectl -RUN curl -fsSL https://raw.githubusercontent.com/helm/helm/master/scripts/get-helm-3 | bash -RUN helm plugin install https://github.com/instrumenta/helm-kubeval - -RUN curl -fsSL https://get.docker.com | sh diff --git a/docs/CONTRIBUTING.md b/docs/CONTRIBUTING.md index 15c997fd..5150abaa 100644 --- a/docs/CONTRIBUTING.md +++ b/docs/CONTRIBUTING.md @@ -31,14 +31,23 @@ master). The prerequisites for contributing to code-server are almost the same as those for [VS Code](https://github.com/Microsoft/vscode/wiki/How-to-Contribute#prerequisites). -There are several differences, however. You must: +There are several differences, however. Here is what is needed: -- Use Node.js version 12.x (or greater) -- Have [yarn](https://classic.yarnpkg.com/en/) installed (which is used to install JS packages and run development scripts) -- Have [nfpm](https://github.com/goreleaser/nfpm) (which is used to build `.deb` and `.rpm` packages and [jq](https://stedolan.github.io/jq/) (used to build code-server releases) installed - -The [CI container](../ci/images/debian10/Dockerfile) is a useful reference for all -of the dependencies code-server uses. +- `node` v12.x or greater +- `git` v2.x or greater +- [`yarn`](https://classic.yarnpkg.com/en/) + - used to install JS packages and run scripts +- [`nfpm`](https://classic.yarnpkg.com/en/) + - used to build `.deb` and `.rpm` packages +- [`jq`](https://stedolan.github.io/jq/) + - used to build code-server releases +- [`gnupg`](https://gnupg.org/index.html) + - all commits must be signed an verified + - see GitHub's ["Managing commit signature verification"](https://docs.github.com/en/github/authenticating-to-github/managing-commit-signature-verification) or follow [this tutorial](https://joeprevite.com/verify-commits-on-github) +- `build-essential` (Linux) + - `apt-get install -y build-essential` - used by VS Code +- `rsync` and `unzip` + - used for code-server releases ## Development Workflow