Skip to content

Commit

Permalink
rm mkdir bacause COPY can auto create dest dir
Browse files Browse the repository at this point in the history
  • Loading branch information
@amutu
amutu committed Jan 1, 2024
1 parent 06a5bcc commit a36b113
Show file tree
Hide file tree
Showing 5 changed files with 8 additions and 17 deletions.
3 changes: 1 addition & 2 deletions docker/alpine/16/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,5 +23,4 @@ COPY --from=builder /usr/local/lib/postgresql/zhparser.so /usr/local/lib/postgre
COPY --from=builder /usr/local/lib/libscws.* /usr/local/lib/
COPY --from=builder /usr/local/share/postgresql/extension/zhparser* /usr/local/share/postgresql/extension/
COPY --from=builder /usr/local/lib/postgresql/bitcode/zhparser* /usr/local/lib/postgresql/bitcode/
COPY --from=builder /usr/local/share/postgresql/tsearch_data/dict.utf8.xdb /usr/local/share/postgresql/tsearch_data/
COPY --from=builder /usr/local/share/postgresql/tsearch_data/rules.utf8.ini /usr/local/share/postgresql/tsearch_data/
COPY --from=builder /usr/local/share/postgresql/tsearch_data/*.utf8.* /usr/local/share/postgresql/tsearch_data/
4 changes: 1 addition & 3 deletions docker/bookworm/15/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ ENV LANG zh_CN.UTF-8

COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/zhparser.so /usr/lib/postgresql/${PG_MAJOR}/lib/
COPY --from=builder /usr/local/lib/libscws.* /usr/local/lib/
RUN mkdir -p /usr/share/postgresql/${PG_MAJOR}/extension
COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/extension/zhparser* /usr/share/postgresql/${PG_MAJOR}/extension/
RUN mkdir -p /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser
COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser/zhparser.bc /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser/
COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser* /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/
COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/tsearch_data/dict.utf8.xdb /usr/share/postgresql/${PG_MAJOR}/tsearch_data/
6 changes: 2 additions & 4 deletions docker/bookworm/16/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ ENV LANG zh_CN.UTF-8

COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/zhparser.so /usr/lib/postgresql/${PG_MAJOR}/lib/
COPY --from=builder /usr/local/lib/libscws.* /usr/local/lib/
RUN mkdir -p /usr/share/postgresql/${PG_MAJOR}/extension
COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/extension/zhparser* /usr/share/postgresql/${PG_MAJOR}/extension/
RUN mkdir -p /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser
COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser/zhparser.bc /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser/
COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/tsearch_data/dict.utf8.xdb /usr/share/postgresql/${PG_MAJOR}/tsearch_data/
COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser* /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/
COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/tsearch_data/*.utf8.* /usr/share/postgresql/${PG_MAJOR}/tsearch_data/
6 changes: 2 additions & 4 deletions docker/bullseye/15/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ ENV LANG zh_CN.UTF-8

COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/zhparser.so /usr/lib/postgresql/${PG_MAJOR}/lib/
COPY --from=builder /usr/local/lib/libscws.* /usr/local/lib/
RUN mkdir -p /usr/share/postgresql/${PG_MAJOR}/extension
COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/extension/zhparser* /usr/share/postgresql/${PG_MAJOR}/extension/
RUN mkdir -p /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser
COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser/zhparser.bc /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser/
COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/tsearch_data/dict.utf8.xdb /usr/share/postgresql/${PG_MAJOR}/tsearch_data/
COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser* /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/
COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/tsearch_data/*.utf8.* /usr/share/postgresql/${PG_MAJOR}/tsearch_data/
6 changes: 2 additions & 4 deletions docker/bullseye/16/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ ENV LANG zh_CN.UTF-8

COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/zhparser.so /usr/lib/postgresql/${PG_MAJOR}/lib/
COPY --from=builder /usr/local/lib/libscws.* /usr/local/lib/
RUN mkdir -p /usr/share/postgresql/${PG_MAJOR}/extension
COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/extension/zhparser* /usr/share/postgresql/${PG_MAJOR}/extension/
RUN mkdir -p /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser
COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser/zhparser.bc /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser/
COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/tsearch_data/dict.utf8.xdb /usr/share/postgresql/${PG_MAJOR}/tsearch_data/
COPY --from=builder /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/zhparser* /usr/lib/postgresql/${PG_MAJOR}/lib/bitcode/
COPY --from=builder /usr/share/postgresql/${PG_MAJOR}/tsearch_data/*.utf8.* /usr/share/postgresql/${PG_MAJOR}/tsearch_data/

0 comments on commit a36b113

Please sign in to comment.