diff options
-rw-r--r-- | api/escalator/cmd/__init__.py | 5 | ||||
-rw-r--r-- | docker/Dockerfile | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/api/escalator/cmd/__init__.py b/api/escalator/cmd/__init__.py index 871224d..2e1b10b 100644 --- a/api/escalator/cmd/__init__.py +++ b/api/escalator/cmd/__init__.py @@ -12,5 +12,6 @@ # WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the # License for the specific language governing permissions and limitations # under the License. -from escalator import i18n -i18n.enable_lazy() +import oslo_i18n + +oslo_i18n.enable_lazy() diff --git a/docker/Dockerfile b/docker/Dockerfile index 48e254f..fa78819 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -1,5 +1,7 @@ FROM centos:7
LABEL escalator_image_version=1.0
+ARG BRANCH
+ENV BRANCH=${BRANCH:-master}
RUN yum -y update
RUN yum -y install centos-release-openstack-newton
RUN yum -y install \
|