Commit c4716ea9 authored by Mudassar Khan's avatar Mudassar Khan
Browse files

meep ipe paths update as per sandbox

parent 366c2b43

go-apps/meep-ipe/Dockerfile

+3 −3
Changes for go-apps/meep-ipe/Dockerfile: 3 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -31,9 +31,9 @@ ENV MEEP_CSE_ID="" 
ENV MEEP_CSE_NAME=""

ENV MEEP_STANDALONE=""



COPY ./bin/meep-ipe/meep-ipe /meep-ipe

COPY entrypoint.sh /

COPY config.yaml.in /

COPY ./meep-ipe /meep-ipe

COPY ./data /

# COPY config.yaml.in /



RUN apt-get update && apt-get install -y --no-install-recommends \

    gettext \

go-apps/meep-ipe/docker_build.sh

+11 −4
Changes for go-apps/meep-ipe/docker_build.sh: 11 added lines, 4 removed lines.
Original line number Diff line number Diff line
@@ -3,20 +3,27 @@ 
set -e

set -x



# Get full path to script directory

SCRIPT=$(readlink -f "$0")

BASEDIR=$(dirname "$SCRIPT")



DEMOBIN=$BASEDIR/bin/meep-ipe



docker pull golang

docker run --rm -it -v"$BASEDIR":/opt/local/etsi/meep-ipe golang bash -c "cd /opt/local/etsi/meep-ipe && ./build-meep-ipe.sh && chown -R $UID:$UID ./bin"

docker run --rm -it \

    -v"$BASEDIR":/opt/local/etsi/meep-ipe \

    golang bash -c "cd /opt/local/etsi/meep-ipe && ./build-meep-ipe.sh && chown -R $UID:$UID ./bin"



echo ""

echo ">>> Demo Service build completed"



# Build the actual runtime image from the Dockerfile

docker build -t meep-ipe:latest "$BASEDIR"

# Stage Dockerfile + data/ folder alongside the binary, matching the

# meepctl dockerize convention (docker-data -> bindir/data -> COPY ./data /).

cp "$BASEDIR/Dockerfile" "$DEMOBIN"

mkdir -p "$DEMOBIN/data"

cp "$BASEDIR/entrypoint.sh" "$DEMOBIN/data/"

cp "$BASEDIR/config.yaml.in" "$DEMOBIN/data/"



docker build -t meep-ipe:latest "$DEMOBIN"



echo ""

echo ">>> Docker image build completed"
 
 No newline at end of file

go-apps/meep-ipe/dockerize.sh

+11 −7
Changes for go-apps/meep-ipe/dockerize.sh: 11 added lines, 7 removed lines.
Original line number Diff line number Diff line
@@ -3,7 +3,6 @@ 
set -e

set +x



# Get full path to script directory

SCRIPT=$(readlink -f "$0")

BASEDIR=$(dirname "$SCRIPT")
@@ -15,9 +14,6 @@ echo ">>> Dockerizing MEEP IPE Server" 
echo ">>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>"

echo ""



# Ensure the Go binary exists before attempting to build the image —

# build it if missing, so this script works standalone even if

# docker_build.sh was never run first.

if [ ! -f "$DEMOBIN/meep-ipe" ]; then

    echo ">>> Binary not found at $DEMOBIN/meep-ipe — building it now"

    docker pull golang
@@ -28,10 +24,18 @@ else 
    echo ">>> Using existing binary at $DEMOBIN/meep-ipe"

fi



echo ""

echo ">>> Building and pushing Docker image"

docker build --no-cache --rm -t meep-docker-registry:30001/meep-ipe "$BASEDIR"

# Stage Dockerfile + data/ folder alongside the binary, matching the

# same convention meepctl's dockerize command uses.

cp "$BASEDIR/Dockerfile" "$DEMOBIN"

mkdir -p "$DEMOBIN/data"

cp "$BASEDIR/entrypoint.sh" "$DEMOBIN/data/"

cp "$BASEDIR/config.yaml.in" "$DEMOBIN/data/"



echo ">>> Dockerizing"

cd "$DEMOBIN"

docker build --no-cache --rm -t meep-docker-registry:30001/meep-ipe .

docker push meep-docker-registry:30001/meep-ipe

cd "$BASEDIR"



echo ""

echo ">>> Done"
 
 No newline at end of file