Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore: fixes the missing tzdata issue in graphscope ubuntu-22.04 based images #3363

Merged
merged 1 commit into from
Nov 17, 2023
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
2 changes: 1 addition & 1 deletion .github/workflows/docker/graphscope-store.Dockerfile
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
FROM ubuntu:22.04

RUN apt-get update -y && \
apt-get install -y sudo default-jdk && \
apt-get install -y sudo default-jdk tzdata && \
apt-get clean -y && \
rm -rf /var/lib/apt/lists/*

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ FROM ubuntu:22.04
ADD artifacts/artifacts.tar.gz /opt/graphscope/

RUN apt-get update -y && \
apt-get install -y sudo default-jdk && \
apt-get install -y sudo default-jdk tzdata && \
apt-get clean -y && \
rm -rf /var/lib/apt/lists/*

Expand Down
2 changes: 1 addition & 1 deletion k8s/dockerfiles/coordinator.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ RUN cd /home/graphscope/GraphScope/ && \
FROM ubuntu:22.04 AS coordinator

RUN apt-get update -y && \
apt-get install -y sudo python3-pip openmpi-bin curl && \
apt-get install -y sudo python3-pip openmpi-bin curl tzdata && \
apt-get clean -y && \
rm -rf /var/lib/apt/lists/*

Expand Down
5 changes: 2 additions & 3 deletions k8s/dockerfiles/graphscope-dev.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@ ENV JAVA_HOME=/usr/lib/jvm/default-java
ENV RUST_BACKTRACE=1

RUN apt-get update && \
apt-get install python3-pip -y && \
apt-get install -y sudo vim && \
apt-get install -y sudo vim python3-pip tzdata tmux && \
apt-get clean -y && \
rm -rf /var/lib/apt/lists/*

Expand All @@ -35,4 +34,4 @@ RUN cd /home/graphscope/gsctl && \
rm -fr gsctl

RUN echo ". /home/graphscope/.graphscope_env" >> ~/.bashrc
RUN python3 -m pip --no-cache install pyyaml --user
RUN python3 -m pip --no-cache install pyyaml ipython --user
2 changes: 1 addition & 1 deletion k8s/dockerfiles/graphscope-store.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ RUN cd /home/graphscope/graphscope \
FROM ubuntu:22.04

RUN apt-get update -y && \
apt-get install -y sudo default-jdk dnsutils && \
apt-get install -y sudo default-jdk dnsutils tzdata && \
apt-get clean -y && \
rm -rf /var/lib/apt/lists/*

Expand Down
2 changes: 1 addition & 1 deletion k8s/dockerfiles/interactive-experimental.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ COPY --from=builder /home/graphscope/GraphScope/interactive_engine/executor/ir/t
COPY --from=builder /home/graphscope/GraphScope/interactive_engine/executor/ir/target/release/start_rpc_server_k8s /opt/graphscope/interactive_engine/executor/ir/target/release/start_rpc_server_k8s

RUN sudo apt-get update -y && \
sudo apt-get install -y default-jdk && \
sudo apt-get install -y default-jdk tzdata && \
sudo apt-get clean -y && \
sudo rm -rf /var/lib/apt/lists/*

Expand Down
2 changes: 1 addition & 1 deletion k8s/dockerfiles/interactive.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ ENV GRAPHSCOPE_HOME=/opt/graphscope
ENV PATH=$PATH:$GRAPHSCOPE_HOME/bin LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$GRAPHSCOPE_HOME/lib

RUN apt-get update -y && \
apt-get install -y sudo default-jdk && \
apt-get install -y sudo default-jdk tzdata && \
apt-get clean -y && \
rm -rf /var/lib/apt/lists/*

Expand Down
3 changes: 1 addition & 2 deletions k8s/dockerfiles/vineyard-dev.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,7 @@ ENV PATH=$PATH:$GRAPHSCOPE_HOME/bin:$HADOOP_HOME/bin:/home/graphscope/.local/bin
COPY --from=ext /opt/hadoop-3.3.0 /opt/hadoop-3.3.0

RUN apt-get update && \
apt-get install python3-pip -y && \
apt-get install -y sudo default-jre && \
apt-get install -y sudo default-jre python3-pip tzdata && \
apt-get clean -y && \
rm -rf /var/lib/apt/lists/*

Expand Down
20 changes: 11 additions & 9 deletions k8s/dockerfiles/vineyard-runtime.Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,17 @@ FROM ubuntu:22.04 AS runtime
ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/local/lib:/usr/local/lib64:/opt/graphscope/lib:/opt/graphscope/lib64

RUN apt-get update -y && \
apt-get install --no-install-recommends -y sudo \
libunwind-dev \
libgomp1 \
openmpi-bin \
libgflags-dev \
libgoogle-glog-dev \
libboost-filesystem-dev \
wget \
ca-certificates && \
apt-get install --no-install-recommends -y \
sudo \
libunwind-dev \
libgomp1 \
openmpi-bin \
libgflags-dev \
libgoogle-glog-dev \
libboost-filesystem-dev \
wget \
ca-certificates \
tzdata && \
apt-get clean -y && \
rm -rf /var/lib/apt/lists/*

Expand Down
Loading