DeathDaDev commited on
Commit
a9142e6
·
1 Parent(s): bd7e16a

Fixed docker errors

Browse files
Files changed (1) hide show
  1. Dockerfile +9 -4
Dockerfile CHANGED
@@ -18,7 +18,8 @@ RUN sed -i 's/mirror.centos.org/vault.centos.org/g' /etc/yum.repos.d/*.repo && \
18
  sed -i 's/^mirrorlist=http/#mirrorlist=http/g' /etc/yum.repos.d/*.repo && \
19
  yum clean all && \
20
  yum -y install epel-release centos-release-scl && \
21
- CMAKE_VERSION=${CMAKE_VERSION} sh /rh_linux_deps.sh
 
22
  ENV PATH /opt/rh/devtoolset-10/root/usr/bin:$PATH
23
  COPY --from=llm-code / /go/src/github.com/ollama/ollama/
24
  WORKDIR /go/src/github.com/ollama/ollama/llm/generate
@@ -33,7 +34,8 @@ RUN sed -i 's/mirror.centos.org/vault.centos.org/g' /etc/yum.repos.d/*.repo && \
33
  sed -i 's/^mirrorlist=http/#mirrorlist=http/g' /etc/yum.repos.d/*.repo && \
34
  yum clean all && \
35
  yum -y install epel-release centos-release-scl && \
36
- CMAKE_VERSION=${CMAKE_VERSION} sh /rh_linux_deps.sh
 
37
  ENV PATH /opt/rh/gcc-toolset-10/root/usr/bin:$PATH
38
  COPY --from=llm-code / /go/src/github.com/ollama/ollama/
39
  WORKDIR /go/src/github.com/ollama/ollama/llm/generate
@@ -48,7 +50,8 @@ RUN sed -i 's/mirror.centos.org/vault.centos.org/g' /etc/yum.repos.d/*.repo && \
48
  sed -i 's/^mirrorlist=http/#mirrorlist=http/g' /etc/yum.repos.d/*.repo && \
49
  yum clean all && \
50
  yum -y install epel-release centos-release-scl && \
51
- CMAKE_VERSION=${CMAKE_VERSION} sh /rh_linux_deps.sh
 
52
  ENV PATH /opt/rh/devtoolset-10/root/usr/bin:$PATH
53
  ENV LIBRARY_PATH /opt/amdgpu/lib64
54
  COPY --from=llm-code / /go/src/github.com/ollama/ollama/
@@ -74,6 +77,7 @@ RUN sed -i 's/mirror.centos.org/vault.centos.org/g' /etc/yum.repos.d/*.repo && \
74
  sed -i 's/^mirrorlist=http/#mirrorlist=http/g' /etc/yum.repos.d/*.repo && \
75
  yum clean all && \
76
  yum -y install epel-release centos-release-scl && \
 
77
  CMAKE_VERSION=${CMAKE_VERSION} GOLANG_VERSION=${GOLANG_VERSION} sh /rh_linux_deps.sh
78
  ENV PATH /opt/rh/devtoolset-10/root/usr/bin:$PATH
79
  COPY --from=llm-code / /go/src/github.com/ollama/ollama/
@@ -99,6 +103,7 @@ RUN sed -i 's/mirror.centos.org/vault.centos.org/g' /etc/yum.repos.d/*.repo && \
99
  sed -i 's/^mirrorlist=http/#mirrorlist=http/g' /etc/yum.repos.d/*.repo && \
100
  yum clean all && \
101
  yum -y install epel-release centos-release-scl && \
 
102
  CMAKE_VERSION=${CMAKE_VERSION} GOLANG_VERSION=${GOLANG_VERSION} sh /rh_linux_deps.sh
103
  ENV PATH /opt/rh/gcc-toolset-10/root/usr/bin:$PATH
104
  COPY --from=llm-code / /go/src/github.com/ollama/ollama/
@@ -166,4 +171,4 @@ ENV NVIDIA_DRIVER_CAPABILITIES=compute,utility
166
  ENV NVIDIA_VISIBLE_DEVICES=all
167
 
168
  ENTRYPOINT ["/bin/ollama"]
169
- CMD ["serve"]
 
18
  sed -i 's/^mirrorlist=http/#mirrorlist=http/g' /etc/yum.repos.d/*.repo && \
19
  yum clean all && \
20
  yum -y install epel-release centos-release-scl && \
21
+ yum-config-manager --save --setopt=base.skip_if_unavailable=true && \
22
+ CMAKE_VERSION=${CMAKE_VERSION} GOLANG_VERSION=${GOLANG_VERSION} sh /rh_linux_deps.sh
23
  ENV PATH /opt/rh/devtoolset-10/root/usr/bin:$PATH
24
  COPY --from=llm-code / /go/src/github.com/ollama/ollama/
25
  WORKDIR /go/src/github.com/ollama/ollama/llm/generate
 
34
  sed -i 's/^mirrorlist=http/#mirrorlist=http/g' /etc/yum.repos.d/*.repo && \
35
  yum clean all && \
36
  yum -y install epel-release centos-release-scl && \
37
+ yum-config-manager --save --setopt=base.skip_if_unavailable=true && \
38
+ CMAKE_VERSION=${CMAKE_VERSION} GOLANG_VERSION=${GOLANG_VERSION} sh /rh_linux_deps.sh
39
  ENV PATH /opt/rh/gcc-toolset-10/root/usr/bin:$PATH
40
  COPY --from=llm-code / /go/src/github.com/ollama/ollama/
41
  WORKDIR /go/src/github.com/ollama/ollama/llm/generate
 
50
  sed -i 's/^mirrorlist=http/#mirrorlist=http/g' /etc/yum.repos.d/*.repo && \
51
  yum clean all && \
52
  yum -y install epel-release centos-release-scl && \
53
+ yum-config-manager --save --setopt=base.skip_if_unavailable=true && \
54
+ CMAKE_VERSION=${CMAKE_VERSION} GOLANG_VERSION=${GOLANG_VERSION} sh /rh_linux_deps.sh
55
  ENV PATH /opt/rh/devtoolset-10/root/usr/bin:$PATH
56
  ENV LIBRARY_PATH /opt/amdgpu/lib64
57
  COPY --from=llm-code / /go/src/github.com/ollama/ollama/
 
77
  sed -i 's/^mirrorlist=http/#mirrorlist=http/g' /etc/yum.repos.d/*.repo && \
78
  yum clean all && \
79
  yum -y install epel-release centos-release-scl && \
80
+ yum-config-manager --save --setopt=base.skip_if_unavailable=true && \
81
  CMAKE_VERSION=${CMAKE_VERSION} GOLANG_VERSION=${GOLANG_VERSION} sh /rh_linux_deps.sh
82
  ENV PATH /opt/rh/devtoolset-10/root/usr/bin:$PATH
83
  COPY --from=llm-code / /go/src/github.com/ollama/ollama/
 
103
  sed -i 's/^mirrorlist=http/#mirrorlist=http/g' /etc/yum.repos.d/*.repo && \
104
  yum clean all && \
105
  yum -y install epel-release centos-release-scl && \
106
+ yum-config-manager --save --setopt=base.skip_if_unavailable=true && \
107
  CMAKE_VERSION=${CMAKE_VERSION} GOLANG_VERSION=${GOLANG_VERSION} sh /rh_linux_deps.sh
108
  ENV PATH /opt/rh/gcc-toolset-10/root/usr/bin:$PATH
109
  COPY --from=llm-code / /go/src/github.com/ollama/ollama/
 
171
  ENV NVIDIA_VISIBLE_DEVICES=all
172
 
173
  ENTRYPOINT ["/bin/ollama"]
174
+ CMD ["serve"]