Skip to content

Commit

Permalink
Dockerfile: Don't fail if CEPH_POINT_RELEASE is unset
Browse files Browse the repository at this point in the history
When building the code with an empty CEPH_POINT_RELEASE, the build fails
with the following message :

    Error response from daemon: ENV must have two arguments

This was introduced by commit 18c0ba7.
If CEPH_POINT_RELEASE is empty, the Dockerfile is missing a parameter.

This patch simply add some double quotes around the variable to avoid this.
From the container itself, it looks like :

    [root@2beae00c96d3 /]# env |grep CEPH
        CEPH_VERSION=luminous
        CEPH_POINT_RELEASE=
    [root@2beae00c96d3 /]#

Signed-off-by: Erwan Velu <[email protected]>
  • Loading branch information
Erwan Velu authored and BlaineEXE committed Apr 9, 2018
1 parent 18c0ba7 commit 6c64074
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/daemon-base/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ MAINTAINER __DOCKERFILE_MAINTAINER__
__DOCKERFILE_TRACEABILITY_LABELS__

ENV CEPH_VERSION __ENV_[CEPH_VERSION]__
ENV CEPH_POINT_RELEASE __ENV_[CEPH_POINT_RELEASE]__
ENV CEPH_POINT_RELEASE "__ENV_[CEPH_POINT_RELEASE]__"

#======================================================
# Install ceph and dependencies, and clean up
Expand Down

0 comments on commit 6c64074

Please sign in to comment.