Skip to content

Fix J11 build add env to test server #214

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
zootalures merged 1 commit into from
Aug 24, 2019
Merged

Fix J11 build add env to test server #214

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 6 additions & 3 deletions images/runtime/Dockerfile-jre11
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ FROM openjdk:11-jre-slim
COPY target/runtime-*.jar target/dependency/*.jar /function/runtime/
COPY src/main/c/libfnunixsocket.so /function/runtime/lib/

RUN ["/usr/bin/java", "-Xshare:dump"]
RUN ["/usr/local/openjdk-11/bin/java", "-Xshare:dump"]

RUN addgroup --system --gid 1000 fn && adduser --uid 1000 --gid 1000 fn

Expand All @@ -13,5 +13,8 @@ RUN addgroup --system --gid 1000 fn && adduser --uid 1000 --gid 1000 fn
# SerialGC is used here as it's likely that we'll be running many JVMs on the same host machine and it's also likely
# that the number of JVMs will outnumber the number of available processors.
#
ENTRYPOINT [ "/usr/bin/java", "-XX:-UsePerfData", "-XX:+UseSerialGC", "-Xshare:on", \
"-Djava.library.path=/function/runtime/lib", "-cp", "/function/app/*:/function/runtime/*", "com.fnproject.fn.runtime.EntryPoint" ]
ENTRYPOINT [ "/usr/local/openjdk-11/bin/java", "-XX:-UsePerfData", "-XX:+UseSerialGC", "-Xshare:on", \
"-Djava.awt.headless=true" , \
"-Djava.library.path=/function/runtime/lib", \
"-cp", "/function/app/*:/function/runtime/*", \
"com.fnproject.fn.runtime.EntryPoint" ]
24 changes: 3 additions & 21 deletions integration-tests/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,30 +14,12 @@ They should _not_ be used for:

# Running locally


(in top-level dir)
Build the runtime:
```bash
export REPOSITORY_LOCATION=/tmp/staging-repository
# on OSX:
export DOCKER_LOCALHOST=docker.for.mac.host.internal

mvn deploy -DaltDeploymentRepository=localStagingDir::default::file://"$REPOSITORY_LOCATION"
```

You may also want to/need build local copies of the build images:
```bash
cd build-image
./docker-build.sh -t fnproject/fn-java-fdk-build .
```

and runtime images:
```
cd runtime
docker build -t fnproject/fn-java-fdk .
docker build -f Dockerfile-jdk11 -t fnproject/fn-java-fdk:jdk11-latest .
./build.sh
```

Finally you can run the integration tests:
Run the integration tests:

```bash
./integration-tests/run_tests_ci.sh
Expand Down
3 changes: 3 additions & 0 deletions integration-tests/fnserver.env
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
FN_MAX_REQUEST_SIZE=6291456
FN_MAX_RESPONSE_SIZE=6291456
FN_MAX_HDR_RESPONSE_SIZE=16384
2 changes: 1 addition & 1 deletion integration-tests/run_tests_ci.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ done

# Start Fn
fn stop || true
fn start --log-level=debug -d
fn start --log-level=debug -d --env-file fnserver.env

until $(curl --output /dev/null --silent --fail http://localhost:8080/); do
printf '.'
Expand Down