feat(sourcemaps-reader): stadalone

feat(chalice): use sourcempas reader stadalone
This commit is contained in:
Taha Yassine Kraiem 2022-10-25 13:30:19 +02:00
parent e4befed9b6
commit 5e312e5ec3
10 changed files with 77 additions and 26 deletions

View file

@ -1,28 +1,22 @@
FROM python:3.10-alpine
LABEL Maintainer="Rajesh Rajendran<rjshrjndrn@gmail.com>"
LABEL Maintainer="KRAIEM Taha Yassine<tahayk2@gmail.com>"
RUN apk add --no-cache build-base nodejs npm tini
RUN apk add --no-cache build-base tini
ARG envarg
# Add Tini
# Startup daemon
ENV SOURCE_MAP_VERSION=0.7.4 \
APP_NAME=chalice \
LISTEN_PORT=8000 \
MAPPING_WASM=/work/sourcemap-reader/mappings.wasm \
ENTERPRISE_BUILD=${envarg}
ADD https://unpkg.com/source-map@${SOURCE_MAP_VERSION}/lib/mappings.wasm /mappings.wasm
WORKDIR /work_tmp
COPY requirements.txt /work_tmp/requirements.txt
RUN pip install --no-cache-dir --upgrade -r /work_tmp/requirements.txt
COPY sourcemap-reader/*.json /work_tmp/
RUN cd /work_tmp && npm install
WORKDIR /work
COPY . .
RUN mv env.default .env && mv /work_tmp/node_modules sourcemap-reader/. \
&& mv /mappings.wasm ${MAPPING_WASM} && chmod 644 ${MAPPING_WASM}
RUN mv env.default .env
RUN adduser -u 1001 openreplay -D
USER 1001

View file

@ -20,8 +20,6 @@ check_prereq() {
function build_api(){
cp -R ../api ../_api
cd ../_api
cp -R ../utilities/utils ../sourcemap-reader/.
cp -R ../sourcemap-reader .
tag=""
# Copy enterprise code
[[ $1 == "ee" ]] && {

View file

@ -1,5 +1,3 @@
#!/bin/sh
cd sourcemap-reader
nohup npm start &
cd ..
uvicorn app:app --host 0.0.0.0 --port $LISTEN_PORT --reload --proxy-headers

View file

@ -38,7 +38,7 @@ PG_POOL=true
sessions_bucket=mobs
sessions_region=us-east-1
sourcemaps_bucket=sourcemaps
sourcemaps_reader=http://127.0.0.1:9000/sourcemaps/%s/sourcemaps
sourcemaps_reader=http://sourcemaps-reader-openreplay.app.svc.cluster.local:9000/sourcemaps/%s/sourcemaps
STAGE=default-foss
version_number=1.4.0
FS_DIR=/mnt/efs

View file

@ -1,26 +1,20 @@
FROM python:3.10-alpine
LABEL Maintainer="Rajesh Rajendran<rjshrjndrn@gmail.com>"
LABEL Maintainer="KRAIEM Taha Yassine<tahayk2@gmail.com>"
RUN apk add --no-cache build-base libressl libffi-dev libressl-dev libxslt-dev libxml2-dev xmlsec-dev xmlsec nodejs npm tini
RUN apk add --no-cache build-base libressl libffi-dev libressl-dev libxslt-dev libxml2-dev xmlsec-dev xmlsec tini
ARG envarg
ENV SOURCE_MAP_VERSION=0.7.4 \
APP_NAME=chalice \
LISTEN_PORT=8000 \
MAPPING_WASM=/work/sourcemap-reader/mappings.wasm \
ENTERPRISE_BUILD=${envarg}
ADD https://unpkg.com/source-map@${SOURCE_MAP_VERSION}/lib/mappings.wasm /mappings.wasm
WORKDIR /work_tmp
COPY requirements.txt /work_tmp/requirements.txt
RUN pip install --no-cache-dir --upgrade -r /work_tmp/requirements.txt
COPY sourcemap-reader/*.json /work_tmp/
RUN cd /work_tmp && npm install
WORKDIR /work
COPY . .
RUN mv env.default .env && mv /work_tmp/node_modules sourcemap-reader/. \
&& mv /mappings.wasm ${MAPPING_WASM} && chmod 644 ${MAPPING_WASM}
RUN mv env.default .env
RUN adduser -u 1001 openreplay -D
USER 1001

View file

@ -1,7 +1,5 @@
#!/bin/sh
sh env_vars.sh
source /tmp/.env.override
cd sourcemap-reader
nohup npm start &
cd ..
uvicorn app:app --host 0.0.0.0 --port $LISTEN_PORT --reload --proxy-headers

View file

@ -48,7 +48,7 @@ PG_POOL=true
sessions_bucket=mobs
sessions_region=us-east-1
sourcemaps_bucket=sourcemaps
sourcemaps_reader=http://127.0.0.1:9000/sourcemaps/%s/sourcemaps
sourcemaps_reader=http://sourcemaps-reader-openreplay.app.svc.cluster.local:9000/sourcemaps/%s/sourcemaps
stage=default-ee
version_number=1.0.0
FS_DIR=/mnt/efs

View file

@ -0,0 +1,23 @@
FROM node:18-alpine
LABEL Maintainer="KRAIEM Taha Yassine<tahayk2@gmail.com>"
RUN apk add --no-cache tini
ARG envarg
ENV SOURCE_MAP_VERSION=0.7.4 \
APP_NAME=sourcemaps-reader \
LISTEN_PORT=9000 \
MAPPING_WASM=/work/mappings.wasm \
ENTERPRISE_BUILD=${envarg}
ADD https://unpkg.com/source-map@${SOURCE_MAP_VERSION}/lib/mappings.wasm ${MAPPING_WASM}
WORKDIR /work
COPY *.json ./
RUN npm install && chmod 644 ${MAPPING_WASM}
COPY . .
RUN adduser -u 1001 openreplay -D
USER 1001
ENTRYPOINT ["/sbin/tini", "--"]
CMD ./entrypoint.sh

44
sourcemap-reader/build.sh Normal file
View file

@ -0,0 +1,44 @@
#!/bin/bash
# Script to build api module
# flags to accept:
# envarg: build for enterprise edition.
# Default will be OSS build.
# Usage: IMAGE_TAG=latest DOCKER_REPO=myDockerHubID bash build.sh <ee>
git_sha1=${IMAGE_TAG:-$(git rev-parse HEAD)}
envarg="default-foss"
check_prereq() {
which docker || {
echo "Docker not installed, please install docker."
exit 1
}
return
}
function build_api(){
cp -R ../sourcemap-reader ../_smr
cd ../_smr
cp -R ../utilities/utils .
tag=""
# Copy enterprise code
[[ $1 == "ee" ]] && {
cp -rf ../ee/sourcemap-reader/* ./
envarg="default-ee"
tag="ee-"
}
docker build -f ./Dockerfile --build-arg envarg=$envarg -t ${DOCKER_REPO:-'local'}/souremaps-reader:${git_sha1} .
cd ../sourcemap-reader
rm -rf ../_smr
[[ $PUSH_IMAGE -eq 1 ]] && {
docker push ${DOCKER_REPO:-'local'}/souremaps-reader:${git_sha1}
docker tag ${DOCKER_REPO:-'local'}/souremaps-reader:${git_sha1} ${DOCKER_REPO:-'local'}/souremaps-reader:${tag}latest
docker push ${DOCKER_REPO:-'local'}/souremaps-reader:${tag}latest
}
echo "sourcemaps-reader docker build completed"
}
check_prereq
build_api $1
echo buil_complete

2
sourcemap-reader/entrypoint.sh Executable file
View file

@ -0,0 +1,2 @@
#!/bin/sh
npm start