Skip to content

Commit

Permalink
testing: add tzdata to scylla-manager container
Browse files Browse the repository at this point in the history
- Install tzdata
- Set default location to NYC
  • Loading branch information
mmatczuk committed Dec 30, 2021
1 parent 6bd0f61 commit e7ed469
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 1 deletion.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -176,7 +176,7 @@ run-server: build-server ## Build and run development server
-p "5443:5443" \
-v "$(PWD)/scylla-manager.dev:/usr/bin/scylla-manager:ro" \
-v "$(PWD)/testing/scylla-manager/scylla-manager.yaml:/etc/scylla-manager/scylla-manager.yaml:ro" \
-it --read-only --rm ubuntu scylla-manager
-it --read-only --rm scylladb/scylla-manager-dev scylla-manager

.PHONY: build
build: build-cli build-agent build-server ## Build all project binaries
Expand Down
1 change: 1 addition & 0 deletions env
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
export LOCAL_BIN=$PWD/bin
export PATH="$LOCAL_BIN:$PATH"
export TZ="America/New_York"

export SCYLLA_MANAGER_CLUSTER=xxx
source <(./sctool.dev completion bash)
2 changes: 2 additions & 0 deletions testing/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@ build: ## Build custom docker image
--build-arg=SCYLLA_VERSION=$(SCYLLA_VERSION) \
-t scylladb/scylla-agent:$(SCYLLA_VERSION) \
scylla
@echo "==> Building development image for Scylla Manager Server"
@docker build --network=host -t scylladb/scylla-manager-dev scylla-manager

.PHONY: up
up: ## Start docker containers
Expand Down
7 changes: 7 additions & 0 deletions testing/scylla-manager/Dockerfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
FROM ubuntu

# Install 3rd party tools
RUN apt-get update && apt-get install -y tzdata \
&& rm -rf /var/lib/apt/lists/*

ENV TZ="America/New_York"

0 comments on commit e7ed469

Please sign in to comment.