Compare commits

...

2 Commits

@ -32,7 +32,7 @@ RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
libmagickwand-dev imagemagick libacl1-dev libxml2-dev
RUN wget https://ftp.gnu.org/gnu/emacs/emacs-27.2.tar.gz \
RUN wget https://ftp.gnu.org/gnu/emacs/emacs-28.1.tar.gz \
-O /tmp/emacs.tar.gz
WORKDIR /tmp/emacs
@ -81,7 +81,9 @@ RUN apt-get update && apt-get -y install \
run mkdir -p /opt/nodejs
RUN curl --location "https://nodejs.org/dist/v17.8.0/node-v17.8.0-linux-x64.tar.xz" | tar -Jxf - --strip-components=1 -C /opt/nodejs/
RUN ln -s /opt/nodejs/bin/* /usr/local/bin/
# Make nodejs dir world-writable. This shouldn't be a problem as the container
# will, naturally only have a single user that has acces to the volume.
RUN chmod -R 777 /opt/nodejs
RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install \
ca-certificates curl gnupg lsb-release
@ -108,27 +110,36 @@ RUN GOPATH=/usr/local/gopkg /bin/bash -c 'for package in \
golang.org/x/tools/cmd/goimports@latest; do \
/usr/local/go/bin/go install "$package"; done'
RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install openjdk-17-jdk openjfx
# RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install openjdk-17-jdk openjfx
RUN wget https://downloads.gradle-dn.com/distributions/gradle-7.4.2-bin.zip -O /tmp/gradle.zip
RUN unzip -d /opt/ /tmp/gradle.zip
RUN rm /tmp/gradle.zip
RUN ln -sf /opt/gradle-7.4.2/bin/gradle /usr/bin/gradle
# RUN wget https://downloads.gradle-dn.com/distributions/gradle-7.4.2-bin.zip -O /tmp/gradle.zip
# RUN unzip -d /opt/ /tmp/gradle.zip
# RUN rm /tmp/gradle.zip
# RUN ln -sf /opt/gradle-7.4.2/bin/gradle /usr/bin/gradle
RUN mkdir -p /opt/maven
RUN wget https://dlcdn.apache.org/maven/maven-3/3.8.5/binaries/apache-maven-3.8.5-bin.tar.gz -O - |\
tar -C /opt/maven --strip-components=1 -xzf -
RUN ln -s /opt/maven/bin/mvn /usr/bin/mvn
# RUN mkdir -p /opt/maven
# RUN wget https://dlcdn.apache.org/maven/maven-3/3.8.6/binaries/apache-maven-3.8.6-bin.tar.gz -O - |\
# tar -C /opt/maven --strip-components=1 -xzf -
# RUN ln -s /opt/maven/bin/mvn /usr/bin/mvn
RUN wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.7.0.2747-linux.zip -O /tmp/sonar-scanner.zip
RUN unzip -d /opt/ /tmp/sonar-scanner.zip
RUN rm /tmp/sonar-scanner.zip
RUN ln -s /opt/sonar-scanner-4.7.0.2747-linux/bin/sonar-scanner /usr/bin/sonar-scanner
# RUN wget https://binaries.sonarsource.com/Distribution/sonar-scanner-cli/sonar-scanner-cli-4.7.0.2747-linux.zip -O /tmp/sonar-scanner.zip
# RUN unzip -d /opt/ /tmp/sonar-scanner.zip
# RUN rm /tmp/sonar-scanner.zip
# RUN ln -s /opt/sonar-scanner-4.7.0.2747-linux/bin/sonar-scanner /usr/bin/sonar-scanner
# Protobuf
RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install protobuf-compiler
RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install html2text wkhtmltopdf pandoc
RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install html2text wkhtmltopdf pandoc ispell idutch irussian ienglish-common offlineimap3 maildir-utils
RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install mariadb-client
RUN curl -L https://github.com/storj/storj/releases/latest/download/uplink_linux_amd64.zip -o uplink_linux_amd64.zip && \
unzip -o uplink_linux_amd64.zip && \
install uplink /usr/local/bin/uplink
RUN curl -1sLf 'https://dl.cloudsmith.io/public/symfony/stable/setup.deb.sh' | sudo -E bash
RUN apt-get -y update && DEBIAN_FRONTEND=noninteractive apt-get -y install symfony-cli
ADD . /opt/workspace-repo
WORKDIR /opt/workspace-repo

@ -13,6 +13,7 @@ elif [[ $TERM != 'dumb' ]]; then
declare -gx TERM=xterm-256color
fi
alias wr='workspace run'
alias td='cd $(mktemp -d)'
alias snr='echo 500759739'
alias snr_vu='echo 2667409'

@ -196,7 +196,7 @@
(flycheck-add-mode 'javascript-eslint 'web-mode)
(defun hugot-javascript-web-mode-hook ()
(when (string-match "\\.js$" (buffer-name))
(when (or (string-match "\\.svelte$" (buffer-name)) (string-match "\\.js$" (buffer-name)))
(setq tab-width 2)
(setq web-mode-markup-indent-offset 2)
(setq web-mode-code-indent-offset 2)

@ -51,6 +51,7 @@ func AddUser(username string, uid string) error {
commandArgs := []string{
"--uid", uid,
"--user-group",
"--shell", "/bin/bash",
username,
}
@ -198,6 +199,7 @@ func Run(privileged bool, detach bool, mounts []string, command []string) error
"--workdir=" + workDir,
"--rm",
"-e", "WORKSPACE_OS=" + hostOS,
"-v", "workspace-nodejs:/opt/nodejs",
}
if hostOS != "darwin" {
@ -290,6 +292,7 @@ func SetEnvVars() {
// Node
os.Setenv("PATH", home+"/.npm_packages/bin:"+os.Getenv("PATH"))
os.Setenv("PATH", "/opt/nodejs/bin:"+os.Getenv("PATH"))
// Perl
os.Setenv("PATH", home+"/perl5/perlbrew/bin:"+os.Getenv("PATH"))

Loading…
Cancel
Save