Skip to content

Commit

Permalink
[MINOR] Version update; two small improvements
Browse files Browse the repository at this point in the history
This commit contains three small changes before releasing DAPHNE 0.2
* Version output updated to 0.2
* Change running unminimize in entrypoint-interactive.sh to a printed hint to avoid the annoying interruption when running interactive containers
* Revert a change to run-daphne.sh that was only relevant when running in a docker container
  • Loading branch information
corepointer committed Jul 30, 2023
1 parent fedc4cf commit d43dadd
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 4 deletions.
4 changes: 3 additions & 1 deletion containers/entrypoint-interactive.sh
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@
# See the License for the specific language governing permissions and
# limitations under the License.

time unminimize
/usr/sbin/sshd -f /etc/ssh/sshd_config
/usr/sbin/groupadd -g "$GID" dockerusers
/usr/sbin/useradd -c 'Docker Container User' -u $UID -g "$GID" -G sudo -m -s /bin/bash -d /home/"$USER" "$USER"
Expand All @@ -27,6 +26,9 @@ SALT=$(date +%M%S)
PASS=Docker!"$SALT"
echo "${USER}":"$PASS" | chpasswd
echo
echo For longer running containers consider running \'unminimize\' to update packages
echo and make the container more suitable for interactive use.
echo
echo "Use "$USER" with password "$PASS" for SSH login"
echo "Docker Container IP address(es):"
awk '/32 host/ { print f } {f=$2}' <<< "$(</proc/net/fib_trie)" | grep -vE "127.0." | sort -u
Expand Down
4 changes: 2 additions & 2 deletions run-daphne.sh
Original file line number Diff line number Diff line change
Expand Up @@ -15,5 +15,5 @@
# limitations under the License.

DAPHNE_ROOT=$PWD
export LD_LIBRARY_PATH=$DAPHNE_ROOT/lib:$LD_LIBRARY_PATH
$DAPHNE_ROOT/bin/daphne --config UserConfig.json $@
export LD_LIBRARY_PATH=$DAPHNE_ROOT/lib:$DAPHNE_ROOT/thirdparty/installed/lib:$LD_LIBRARY_PATH
$DAPHNE_ROOT/bin/daphne --config UserConfig.json $@
2 changes: 1 addition & 1 deletion src/api/internal/daphne_internal.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ void parseScriptArgs(const llvm::cl::list<string>& scriptArgsCli, unordered_map<
void printVersion(llvm::raw_ostream& os) {
// TODO Include some of the important build flags into the version string.
os
<< "DAPHNE Version 0.2-rc2\n"
<< "DAPHNE Version 0.2\n"
<< "An Open and Extensible System Infrastructure for Integrated Data Analysis Pipelines\n"
<< "https://github.com/daphne-eu/daphne\n";
}
Expand Down

0 comments on commit d43dadd

Please sign in to comment.