Commit c47e63d5 authored by Tomek Piekarz's avatar Tomek Piekarz
Browse files

merge fixes from branch morphemic-rc1.5 to morphemic-rc2.0

parent 026ff779
Pipeline #17124 passed with stage
in 56 seconds
......@@ -278,6 +278,7 @@ deploy:prophet:
only:
- master
- morphemic-rc1.5
- morphemic-rc2.0
services:
- $DOCKER_DIND_SERVICE
script:
......@@ -293,6 +294,7 @@ deploy:gluonmachines:
only:
- master
- morphemic-rc1.5
- morphemic-rc2.0
services:
- $DOCKER_DIND_SERVICE
script:
......
......@@ -35,13 +35,13 @@ RUN apt-get install -y \
COPY forecasting_gluonts/docker_image/requirements.txt .
RUN pip3 install --no-cache-dir -r requirements.txt
ADD https://gitlab.ow2.org/melodic/morphemic-preprocessor/-/archive/morphemic-rc1.5/morphemic-preprocessor-morphemic-rc1.5.tar.gz /var/lib/morphemic/
ADD https://gitlab.ow2.org/melodic/morphemic-preprocessor/-/archive/morphemic-rc2.0/morphemic-preprocessor-morphemic-rc2.0.tar.gz /var/lib/morphemic/
COPY forecasting_gluonts/ ./
RUN cd /var/lib/morphemic/ \
&& tar -zxf morphemic-preprocessor-morphemic-rc1.5.tar.gz \
&& cd morphemic-preprocessor-morphemic-rc1.5 \
&& tar -zxf morphemic-preprocessor-morphemic-rc2.0.tar.gz \
&& cd morphemic-preprocessor-morphemic-rc2.0 \
&& cd morphemic-datasetmaker && python3 setup.py install \
&& cd ../.. \
&& rm -rf /var/lib/morphemic \
......
......@@ -2,14 +2,14 @@
sudo docker rmi -f $(sudo docker images)
# Build the image from dockerfile and clone the latest version of my code
sudo docker build . -t gitlab.ow2.org:4567/melodic/morphemic-preprocessor/gluonmachines:morphemic-rc1.5
sudo docker build . -t gitlab.ow2.org:4567/melodic/morphemic-preprocessor/gluonmachines:morphemic-rc2.0
# Test the image
#sudo docker run -it --env-file variables.env gitlab.ow2.org:4567/melodic/morphemic-preprocessor/gluonmachines:morphemic-rc1.5
#sudo docker run -it --env-file variables.env gitlab.ow2.org:4567/melodic/morphemic-preprocessor/gluonmachines:morphemic-rc2.0
# Push the image to gitlab
sudo docker login gitlab.ow2.org:4567
sudo docker push gitlab.ow2.org:4567/melodic/morphemic-preprocessor/gluonmachines:morphemic-rc1.5
sudo docker push gitlab.ow2.org:4567/melodic/morphemic-preprocessor/gluonmachines:morphemic-rc2.0
docker run -t --env-file=variables.env --network=bridge $image_name
......
......@@ -3,7 +3,7 @@ version: '2'
services:
prophet:
#image: gitlab.ow2.org:4567/melodic/morphemic-preprocessor/prophet:morphemic-rc1.5
#image: gitlab.ow2.org:4567/melodic/morphemic-preprocessor/prophet:morphemic-rc2.0
image: activeeon/morphemic
#network_mode: bridge
container_name: prophet
......
......@@ -46,7 +46,7 @@ services:
- variables.env
prophet:
image: gitlab.ow2.org:4567/melodic/morphemic-preprocessor/prophet:morphemic-rc1.5
image: gitlab.ow2.org:4567/melodic/morphemic-preprocessor/prophet:morphemic-rc2.0
#image: activeeon/morphemic
network_mode: bridge
container_name: prophet
......@@ -57,7 +57,7 @@ services:
gluonts:
image: gitlab.ow2.org:4567/melodic/morphemic-preprocessor/gluonmachines:morphemic-rc1.5
image: gitlab.ow2.org:4567/melodic/morphemic-preprocessor/gluonmachines:morphemic-rc2.0
#image: activeeon/morphemic
network_mode: bridge
container_name: gluonmachines
......
......@@ -72,13 +72,13 @@ RUN python -m pip install py4j==0.10.8.1
RUN rm -rf ~/.cache/pip
#Clone the prophet forecaster code
#-------------------------
ADD https://gitlab.ow2.org/melodic/morphemic-preprocessor/-/archive/morphemic-rc1.5/morphemic-preprocessor-morphemic-rc1.5.tar.gz /var/lib/morphemic/
ADD https://gitlab.ow2.org/melodic/morphemic-preprocessor/-/archive/morphemic-rc2.0/morphemic-preprocessor-morphemic-rc2.0.tar.gz /var/lib/morphemic/
COPY forecasting_prophet/ ./
RUN cd /var/lib/morphemic/ \
&& tar -zxf morphemic-preprocessor-morphemic-rc1.5.tar.gz \
&& cd morphemic-preprocessor-morphemic-rc1.5 \
&& tar -zxf morphemic-preprocessor-morphemic-rc2.0.tar.gz \
&& cd morphemic-preprocessor-morphemic-rc2.0 \
&& cd morphemic-datasetmaker && python3 setup.py install \
&& cd ../.. \
&& rm -rf /var/lib/morphemic \
......
......@@ -2,14 +2,14 @@
sudo docker rmi -f $(sudo docker images)
# Build the image from dockerfile and clone the latest version of my code
sudo docker build . -t gitlab.ow2.org:4567/melodic/morphemic-preprocessor/prophet:morphemic-rc1.5
sudo docker build . -t gitlab.ow2.org:4567/melodic/morphemic-preprocessor/prophet:morphemic-rc2.0
# Test the image
#sudo docker run -it --env-file variables.env gitlab.ow2.org:4567/melodic/morphemic-preprocessor/prophet:morphemic-rc1.5
#sudo docker run -it --env-file variables.env gitlab.ow2.org:4567/melodic/morphemic-preprocessor/prophet:morphemic-rc2.0
# Push the image to gitlab
sudo docker login gitlab.ow2.org:4567
sudo docker push gitlab.ow2.org:4567/melodic/morphemic-preprocessor/prophet:morphemic-rc1.5
sudo docker push gitlab.ow2.org:4567/melodic/morphemic-preprocessor/prophet:morphemic-rc2.0
......@@ -3,7 +3,7 @@ version: '2'
services:
prophet:
#image: gitlab.ow2.org:4567/melodic/morphemic-preprocessor/prophet:morphemic-rc1.5
#image: gitlab.ow2.org:4567/melodic/morphemic-preprocessor/prophet:morphemic-rc2.0
image: prophet
network_mode: bridge
container_name: prophetTest
......@@ -13,7 +13,7 @@ services:
gluonts:
image: gitlab.ow2.org:4567/melodic/morphemic-preprocessor/gluonmachines:morphemic-rc1.5
image: gitlab.ow2.org:4567/melodic/morphemic-preprocessor/gluonmachines:morphemic-rc2.0
#image: activeeon/morphemic
network_mode: bridge
container_name: gluonmachines
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment