Commit 6b350213 authored by Kiraa Corsac's avatar Kiraa Corsac
Browse files

Merge branch 'release-0.1.x.x' of... 

Merge branch 'release-0.1.x.x' of https://gitlab.fi.muni.cz/xopaleny/LoopGrafter-Frontend into release-0.1.x.x
parents 874e4c89 f90a181d

.gitlab-ci.yml

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ build-container: 
    - docker info

    - make clean dist

    - cd docker/

    - cp ../dist/loopgrafter-frontend-0.1.0.0.tar.gz .

    - cp ../dist/loopgrafter-frontend-0.1.0.1.tar.gz .

    - docker build -t "$DOCKER_IMAGE_NAME:latest" .



deploy-on-decibel:

Makefile

+1 −1
Original line number Diff line number Diff line 
VERSION=0.1.0.0

VERSION=0.1.0.1

PKGNAME=loopgrafter-frontend-$(VERSION)



all:

docker/Dockerfile

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ RUN \ 
COPY nginx_site.conf /etc/nginx/sites-available/default

COPY init.sh /



ENV LOOPGRAFTER_VERSION 0.1.0.0

ENV LOOPGRAFTER_VERSION 0.1.0.1



COPY loopgrafter-frontend-${LOOPGRAFTER_VERSION}.tar.gz /tmp/

docker/init.sh

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ NGINX_CONF="/etc/nginx/sites-available/default" 
export LOOPGRAFTER_FRONTEND_PREFIX=$(echo -n /${LOOPGRAFTER_FRONTEND_PREFIX}/ | sed 's#//#/#g')

export LOOPGRAFTER_BACKEND_URL=$(echo -n ${LOOPGRAFTER_BACKEND_URL}/ | sed 's#//$#/#g')



sed -i "s#__version__#${LOOPGRAFTER_VERSION}#g" "$NGINX_CONF"

sed -i "s#__prefix__#${LOOPGRAFTER_FRONTEND_PREFIX:-/}#g" "$NGINX_CONF"

sed -i "s#__backend__#${LOOPGRAFTER_BACKEND_URL:-http://backend:6969/api/}#g" "$NGINX_CONF"

docker/nginx_site.conf

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ server { 
    }



    location __prefix__ {

        alias  /opt/loopgrafter-frontend-0.1.0.0/dist/;

        alias  /opt/loopgrafter-frontend-__version__/dist/;

        index  index.html index.htm;

    }