Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ image/squash.tar
image/nsenter/nsenter
image/docker-squash
image/docker-squash.tar.gz
image/discourse_dev/install-rust
image/discourse_dev/postgres.template.yml
image/discourse_dev/redis.template.yml
.gc-state/*
Expand Down
1 change: 0 additions & 1 deletion image/auto_build.rb
Original file line number Diff line number Diff line change
Expand Up @@ -159,7 +159,6 @@ def dev_deps()
"sed -e 's/\(db_name: discourse\)/\1_development/' ../templates/postgres.template.yml > discourse_dev/postgres.template.yml",
)
run("cp ../templates/redis.template.yml discourse_dev/redis.template.yml")
run("cp base/install-rust discourse_dev/install-rust")
end

if ARGV.length == 0
Expand Down
30 changes: 0 additions & 30 deletions image/base/install-rust

This file was deleted.

9 changes: 1 addition & 8 deletions image/discourse_dev/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,7 @@ RUN /pups/bin/pups /pups/redis.yml
RUN locale-gen en_US.UTF-8
ENV LANG=en_US.UTF-8 \
LANGUAGE=en_US:en \
LC_ALL=en_US.UTF-8 \
RUSTUP_HOME=/usr/local/rustup \
CARGO_HOME=/usr/local/cargo \
PATH=/usr/local/cargo/bin:$PATH
LC_ALL=en_US.UTF-8

# get postgres going
ADD postgres.template.yml /pups/postgres.yml
Expand All @@ -57,10 +54,6 @@ RUN mv /shared/postgres_data /shared/postgres_data_orig
# invocations when used with a mounted volume)
ADD ensure-database /etc/runit/1.d/ensure-database

ADD install-rust /tmp/install-rust
ADD install-selenium /tmp/install-selenium
RUN /tmp/install-selenium

# Install & Configure MailHog (https://github.com/mailhog/MailHog)
RUN wget -qO /tmp/mailhog https://github.com/mailhog/MailHog/releases/download/v1.0.1/MailHog_linux_amd64\
&& echo "e2ed634ded49929f089b20045581955ed217672078fd86082dd7a6c67c5d09c7 /tmp/mailhog" | sha256sum -c -\
Expand Down
25 changes: 0 additions & 25 deletions image/discourse_dev/install-selenium

This file was deleted.