Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
2 changes: 1 addition & 1 deletion src/anaconda/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.202.14",
"version": "0.202.15",
"build": {
"latest": true,
"rootDistro": "debian",
Expand Down
2 changes: 1 addition & 1 deletion src/base-alpine/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.205.0",
"version": "0.205.1",
"variants": [
"3.16",
"3.15",
Expand Down
2 changes: 1 addition & 1 deletion src/base-debian/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.203.0",
"version": "0.203.1",
"variants": [
"buster",
"bullseye"
Expand Down
2 changes: 1 addition & 1 deletion src/base-ubuntu/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.1",
"version": "1.0.2",
"variants": [
"jammy",
"focal",
Expand Down
2 changes: 1 addition & 1 deletion src/cpp/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.206.0",
"version": "0.206.1",
"variants": [
"bullseye",
"buster",
Expand Down
2 changes: 1 addition & 1 deletion src/dotnet/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.204.0",
"version": "0.204.1",
"variants": [
"7.0-bullseye-slim",
"7.0-jammy",
Expand Down
2 changes: 1 addition & 1 deletion src/go/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.207.9",
"version": "0.207.10",
"variants": [
"1.19-bullseye",
"1.19-buster",
Expand Down
2 changes: 1 addition & 1 deletion src/java-8/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "1.0.7",
"version": "1.0.8",
"variants": [
"bullseye",
"buster"
Expand Down
2 changes: 1 addition & 1 deletion src/java/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.205.13",
"version": "0.205.14",
"variants": [
"17-bullseye",
"17-buster",
Expand Down
2 changes: 1 addition & 1 deletion src/javascript-node/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.204.9",
"version": "0.204.10",
"variants": ["18-bullseye", "16-bullseye", "14-bullseye", "18-buster", "16-buster", "14-buster"],
"build": {
"latest": "18-bullseye",
Expand Down
2 changes: 1 addition & 1 deletion src/jekyll/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.1.13",
"version": "0.1.14",
"variants": [
"2.7-bullseye",
"2.7-buster"
Expand Down
2 changes: 1 addition & 1 deletion src/miniconda/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.202.11",
"version": "0.202.12",
"build": {
"latest": true,
"rootDistro": "debian",
Expand Down
2 changes: 1 addition & 1 deletion src/php/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.203.12",
"version": "0.203.13",
"variants": [
"8.1-apache-bullseye",
"8.0-apache-bullseye",
Expand Down
2 changes: 1 addition & 1 deletion src/python/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.204.0",
"version": "0.204.1",
"variants": [
"3.11-bullseye",
"3.10-bullseye",
Expand Down
2 changes: 1 addition & 1 deletion src/ruby/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.203.12",
"version": "0.203.13",
"variants": [
"3.1-bullseye",
"3.0-bullseye",
Expand Down
2 changes: 1 addition & 1 deletion src/rust/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.203.0",
"version": "0.203.1",
"variants": [
"buster",
"bullseye"
Expand Down
2 changes: 1 addition & 1 deletion src/typescript-node/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "0.204.8",
"version": "0.204.9",
"variants": ["18-bullseye", "16-bullseye", "14-bullseye", "18-buster", "16-buster", "14-buster"],
"build": {
"latest": "16-buster",
Expand Down
2 changes: 1 addition & 1 deletion src/universal/manifest.json
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
{
"version": "2.1.0",
"version": "2.1.1",
"build": {
"latest": true,
"rootDistro": "debian",
Expand Down
34 changes: 18 additions & 16 deletions src/universal/test-project/test.sh
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,24 @@ check "run-puppeteer" node puppeteer.js
# Check Oryx
check "oryx" oryx --version

# Ensures nvm works in a Node Project
check "default-node-version" bash -c "node --version | grep 16."
check "default-node-location" bash -c "which node | grep /home/codespace/nvm/current/bin"
check "oryx-build-node-projectr" bash -c "oryx build ./sample/node"
check "oryx-configured-current-node-version" bash -c "ls -la /home/codespace/nvm/current | grep /opt/nodejs"
check "nvm-install-node" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 8.0.0"
check "nvm-works-in-node-project" bash -c "node --version | grep v8.0.0"
check "default-node-location-remained-same" bash -c "which node | grep /home/codespace/nvm/current/bin"

# Ensures sdkman works in a Java Project
check "default-java-version" bash -c "java --version | grep 17."
check "default-java-location" bash -c "which java | grep /home/codespace/java/current/bin"
check "oryx-build-java-project" bash -c "oryx build ./sample/java"
check "oryx-configured-current-java-version" bash -c "ls -la /home/codespace/java/current | grep /opt/java"
check "sdk-install-java" bash -c ". /usr/local/sdkman/bin/sdkman-init.sh && sdk install java 19.0.1-oracle < /dev/null"
check "sdkman-works-in-java-project" bash -c "java --version | grep 19.0.1"
check "default-java-location-remained-same" bash -c "which java | grep /home/codespace/java/current/bin"

# Make sure that Oryx builds Python projects correctly
pythonVersion=$(python -V 2>&1 | grep -Po '(?<=Python )(.+)')
pythonSite=`python -m site --user-site`
Expand All @@ -152,22 +170,6 @@ check "oryx-install-java-12.0.2" oryx prep --skip-detection --platforms-and-vers
check "java-12.0.2-installed-by-oryx" ls /opt/java/ | grep 12.0.2
check "java-version-on-path-is-12.0.2" java --version | grep 12.0.2

# Ensures nvm works in a Node Project
check "default-node-version" bash -c "node --version | grep 16."
check "default-node-location" bash -c "which node | grep /home/codespace/nvm/current/bin"
check "oryx-build-node-projectr" bash -c "oryx build ./sample/node"
check "nvm-install-node" bash -c ". /usr/local/share/nvm/nvm.sh && nvm install 8.0.0"
check "nvm-works-in-node-project" bash -c "node --version | grep v8.0.0"
check "default-node-location-remained-same" bash -c "which node | grep /home/codespace/nvm/current/bin"

# Ensures sdkman works in a Java Project
check "default-java-version" bash -c "java --version | grep 17."
check "default-java-location" bash -c "which java | grep /home/codespace/java/current/bin"
check "oryx-build-java-project" bash -c "oryx build ./sample/java"
check "sdk-install-java" bash -c ". /usr/local/sdkman/bin/sdkman-init.sh && sdk install java 19.0.1-oracle < /dev/null"
check "sdkman-works-in-java-project" bash -c "java --version | grep 19.0.1"
check "default-java-location-remained-same" bash -c "which java | grep /home/codespace/java/current/bin"

ls -la /home/codespace

# Report result
Expand Down