Skip to content

Commit

Permalink
Update to Ubuntu 18.04 for both Docker and Vagrant (#825)
Browse files Browse the repository at this point in the history
  • Loading branch information
berggren authored Feb 7, 2019
1 parent 486a7e7 commit d951908
Show file tree
Hide file tree
Showing 5 changed files with 5 additions and 5 deletions.
2 changes: 1 addition & 1 deletion docker/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Use the official Docker Hub Ubuntu 14.04 base image
FROM ubuntu:16.04
FROM ubuntu:18.04

# Update the base image
RUN apt-get update && apt-get -y upgrade && apt-get -y dist-upgrade
Expand Down
2 changes: 1 addition & 1 deletion docker/Dockerfile-dev
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# Use the official Docker Hub Ubuntu 14.04 base image
FROM ubuntu:16.04
FROM ubuntu:18.04

# Copy the entrypoint script into the container
COPY docker/timesketch-dev-entrypoint.sh /docker-entrypoint.sh
Expand Down
2 changes: 1 addition & 1 deletion docker/docker-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ if [ "$1" = 'timesketch' ]; then

# Sleep to allow the other processes to start
sleep 5
tsctl add_user -u "$TIMESKETCH_USER" -p "$TIMESKETCH_PASSWORD"
tsctl add_user --username "$TIMESKETCH_USER" --password "$TIMESKETCH_PASSWORD"

# Run the Timesketch server (without SSL)
exec `bash -c "/usr/local/bin/celery -A timesketch.lib.tasks worker --uid nobody --loglevel info &\
Expand Down
2 changes: 1 addition & 1 deletion docker/timesketch-dev-entrypoint.sh
Original file line number Diff line number Diff line change
Expand Up @@ -93,7 +93,7 @@ if [ "$1" = 'timesketch' ]; then
sed -i s/"ENABLE_EXPERIMENTAL_UI = False"/"ENABLE_EXPERIMENTAL_UI = True"/ /etc/timesketch.conf

# Add web user
tsctl add_user -u "${TIMESKETCH_USER}" -p "${TIMESKETCH_USER}"
tsctl add_user --username "${TIMESKETCH_USER}" --password "${TIMESKETCH_USER}"

echo "Timesketch development server is ready!"

Expand Down
2 changes: 1 addition & 1 deletion vagrant/Vagrantfile
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ unless Vagrant.has_plugin?("vagrant-disksize")
end

Vagrant.configure(2) do |config|
config.vm.box = "ubuntu/xenial64"
config.vm.box = "ubuntu/bionic64"
config.disksize.size = "50GB"
config.vm.box_check_update = true

Expand Down

0 comments on commit d951908

Please sign in to comment.