Skip to content

Docker build repairs #1016

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.

Sign up for GitHub

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

Merged
rafie merged 1 commit into from
Jun 1, 2023
Merged

Docker build repairs #1016

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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 build/docker/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ include $(ROOT)/deps/readies/mk/main

REPO=rejson

REDIS_VERSION=7
REDIS_VERSION=7.2-rc2

OSNICK.official=bullseye

Expand Down
2 changes: 0 additions & 2 deletions build/docker/dockerfile.tmpl
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@

#----------------------------------------------------------------------------------------------
# FROM redisfab/redis:{{REDIS_VERSION}}-{{ARCH}}-{{OSNICK}} AS redis
FROM {{OS}} AS builder

RUN if [ -f /root/.profile ]; then sed -ie 's/mesg n/tty -s \&\& mesg -n/g' /root/.profile; fi
Expand All @@ -9,7 +8,6 @@ SHELL ["/bin/bash", "-l", "-c"]
RUN echo "Building for {{OSNICK}} ({{OS}}) for {{ARCH}} [with Redis {{REDIS_VERSION}}]"

WORKDIR /build
# COPY --from=redis /usr/local/ /usr/local/

ADD . /build

Expand Down