-
Notifications
You must be signed in to change notification settings - Fork 5
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.
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
Docker, bug fixes, and more #12
Merged
Changes from 16 commits
Commits
Show all changes
26 commits
Select commit
Hold shift + click to select a range
27ce16b
Fixes to some places where sds is used
amnuts c00d4bc
Renamed amnuts binary and main source file to remove the version number
amnuts c189c84
Started a bit of a restructure
amnuts a860075
Renamed the 'storage' directory to something better
amnuts dd3392a
Started to update some docs
amnuts 9ffb7b1
Changed to alpine for smaller image
amnuts 36175d6
Further docker-related tweaks
amnuts 9f59d7c
Fixed some sdsfree calls to be int he right places
amnuts 0470b03
Merge pull request #10 from amnuts/dockerize
amnuts 06cfc2d
Updated vendor files for sds
amnuts a74e322
Moved help command related functions to the help command file
amnuts 9ca32ac
Fixed segfault when swapping sessions on same user
amnuts 85d1e4c
Merge pull request #11 from amnuts/sds-update
amnuts 1b18af3
PR feedback: fixed typo
amnuts bed438d
PR feedback: consistency on paths in defines.h
amnuts 5fa2f9c
Updated some emails, urls, and typos
amnuts 09797e7
Corrected line endings and typos
amnuts 5f0f534
Added email address back in
amnuts d862864
Fixed some issues
amnuts 63cd916
Resolved some more buffer overflows
amnuts fc0a880
Add define to make alignment more obvious
amnuts da2c18b
Removed compiled warnings from align_strings function
amnuts 3499f71
Fixing some typos
amnuts a7ce2cf
Updated some texts
amnuts 8ef3b9a
Prevent globbing
amnuts 0c33c4f
Small tweak to script
amnuts File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,46 +1,37 @@ | ||
+-----------------------------------------------------------------------------+ | ||
README - README - README - README - README - README - README - README - README | ||
Introductory information for the Unix talker code Amnuts | ||
README - README - README - README - README - README - README - README | ||
Introductory information for the Amnuts talker code | ||
+-----------------------------------------------------------------------------+ | ||
|
||
Welcome to the Amnuts talker code, version 2.3.0! Or, if you have already | ||
used Amnuts, then welcome back! This is the latest version of Amnuts and MANY | ||
things have changed. | ||
Welcome to the Amnuts talker code! Or, if you have already used Amnuts, then | ||
welcome back - it's good to still have you with us. :-) | ||
|
||
Amnuts development slowed down for a (long) while, but thanks to two people | ||
in particular, it managed to get back on track. These people go by the handles | ||
'Ardant' and 'Uzume'. Ardant supplied a CVS repository and bug tracking | ||
software for Amnuts, and Uzume and worked tirelessly in updating Amnuts and | ||
making it more stable. Many thanks to both of them. | ||
It has been 20 years - yup, two whole decades - since this README was last | ||
updated, and, honestly, not much has changed in the world of Amnuts Talkers. | ||
The Golden Age of talkers has long past, though it's still awesome to see some | ||
die-hard fans still out there and keeping talkers alive (Marado's TalkerNode, | ||
for example). | ||
|
||
Because of the CVS and Bugzilla, a new website was set up for the development | ||
of the Amnuts talker code. This can be found at: | ||
As for Amnuts, as you're undoubtedly aware, it's now available from GitHub. | ||
You can get there from: | ||
|
||
http://www.amnuts.net/ | ||
https://www.amnuts.net/ | ||
or https://github.com/amnuts/Amnuts | ||
|
||
Instructions can be found there on how to use CVS and Bugzilla. If you find | ||
any bugs with this version of Amnuts then it would be appreciated if you use | ||
Bugzilla to report them. From the CVS repository you can download the latest | ||
files. | ||
You can submit issues and post up on the discussion board there. Please feel | ||
free to fork and submit pull requests. | ||
|
||
The Amnuts code can be found, as always, at: | ||
To get started with Amnuts you'll need either a linux environment or you can | ||
use docker. For further details, see the docs/docker and and other related | ||
files in the docs directory. | ||
|
||
http://amnuts.talker.com/ | ||
Lots of the documentation and files here haven't been updated for those same | ||
two decades, but hopefully one day they will be revived and revamped. Until | ||
then, just head towards the wind and push on as best you can. ;-) | ||
|
||
or can now also be access via: | ||
Thanks for using Amnuts, and as you're here you must be interested in talkers, | ||
so thanks also for keeping those alive! Enjoy! | ||
|
||
http://www.amnuts.org/ | ||
|
||
Please read the 'IMPORTANT' file, and the 'amnuts_changes' in the DOCs | ||
directory for more information on what changes have been made since | ||
version 2.2.1 (the previous release to this one) because there have been a | ||
LOT of them! Even if you are a previous Amnuts user, programmer, owner, | ||
whatever - you should STILL READ THE FILES! :) | ||
|
||
Thanks for using Amnuts! Enjoy! | ||
|
||
|
||
Andrew Collington | ||
The Amnuts Development Team | ||
August, 2003 | ||
Andrew Collington | ||
February, 2023 | ||
+-----------------------------------------------------------------------------+ |
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,48 @@ | ||
#!/usr/bin/env bash | ||
|
||
MACHINE=$(uname -m) | ||
if [ "$MACHINE" == "x86_64" ] || [ "$MACHINE" == "i686" ]; then | ||
OS_ARCH="amd64" | ||
elif [ "$MACHINE" == "aarch64" ] || [ "$MACHINE" == "arm64" ]; then | ||
OS_ARCH="arm64v8" | ||
else | ||
OS_ARCH="amd64" | ||
echo "Unknown platform - falling back to amd64" | ||
fi | ||
|
||
CONFIG_FILE="$(pwd)/files/datafiles/config" | ||
MAIN_PORT=$(cat $CONFIG_FILE | grep "\bmainport\b" | awk '{ print $2 }') | ||
WIZ_PORT=$(cat $CONFIG_FILE | grep "\bwizport\b" | awk '{ print $2 }') | ||
LINK_PORT=$(cat $CONFIG_FILE | grep "\blinkport\b" | awk '{ print $2 }') | ||
|
||
cat << EOT > Dockerfile | ||
FROM ${OS_ARCH}/alpine | ||
|
||
RUN apk add build-base supervisor bash busybox-extras | ||
COPY supervisord.conf /etc/supervisord.conf | ||
|
||
WORKDIR /amnuts | ||
EXPOSE $MAIN_PORT | ||
EXPOSE $WIZ_PORT | ||
EXPOSE $LINK_PORT | ||
|
||
CMD ["/usr/bin/supervisord", "-c", "/etc/supervisord.conf"] | ||
EOT | ||
|
||
cat << EOT > docker-compose.yml | ||
version: "3" | ||
services: | ||
amnuts: | ||
build: ./ | ||
image: amnuts-build | ||
environment: | ||
- "MAIN_PORT=$MAIN_PORT" | ||
- "WIZ_PORT=$WIZ_PORT" | ||
- "LINK_PORT=$LINK_PORT" | ||
ports: | ||
- "${MAIN_PORT}:${MAIN_PORT}" | ||
- "${WIZ_PORT}:${WIZ_PORT}" | ||
- "${LINK_PORT}:${LINK_PORT}" | ||
volumes: | ||
- .:/amnuts | ||
EOT |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,56 @@ | ||
+------------------------------------------------------------------------------+ | ||
DOCKER - DOCKER - DOCKER - DOCKER - DOCKER - DOCKER - DOCKER - DOCKER - DOCKER | ||
Information on spinning up Amnuts with Docker | ||
+------------------------------------------------------------------------------+ | ||
|
||
The Docker setup for Amnuts is pretty new and probably doesn't cover all the | ||
needs you could want, and if you have to change things then you're pretty much | ||
on your own. However, it could provide you a way to compile and run an Amnuts | ||
based talker without having all the GCC requirements installed... So long as | ||
you have bash and docker, you should be able to get up and running pretty easily. | ||
|
||
To start with, you'll need to run: | ||
|
||
./docker-startup.sh | ||
|
||
This will create the Dockerfile and docker-compose.yml files for your platform | ||
(amd64 or arm64v8 are supported). If you make changes to the docker-startup.sh | ||
file or the accompanying supervisord.conf file, you'll need to remove the | ||
previously built image (assuming you have built one) and run the docker-setup | ||
file again. | ||
|
||
To compile the code, use the command: | ||
|
||
docker-compose run --rm amnuts make install | ||
|
||
This will build the image if you haven't already, create a container, compile | ||
the talker, then remove the container. Because all the files are mounted as a | ||
volume, you'll not lose any files when the container is removed. | ||
|
||
In fact, you can run any of the Makefile commands this way, eg: | ||
|
||
docker-compose run --rm amnuts make distclean | ||
|
||
If you want to jump on the container itself, use: | ||
|
||
docker-compose run --rm amnuts /bin/bash | ||
|
||
Once you have run the "make install" command, you can then start the talker | ||
with: | ||
|
||
docker-compose run -d --service-ports amnuts | ||
|
||
This will run a container in the background with the Amnuts talker running. | ||
Supervisord is used to keep the process going. | ||
|
||
Alternatively, you can simply build the image with: | ||
|
||
docker-compose build | ||
|
||
And then run it with: | ||
|
||
docker-compose up | ||
|
||
The docker setup is in its early stages, so may well be adapted and changed | ||
over time. Your mileage may vary. Use your best judgement. Try things out. | ||
Raise an issue or a pull request if you know a better way! |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1 @@ | ||
*.dump |
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
syslog.* | ||
last_command.* |
File renamed without changes.
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh no, the development team has been removed and we jumped ahead a few decades
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I can't do anything about the march of time - it really has been a couple decades since that was last updated! But it wasn't cool for me to remove the dev team line, so that'll go back in once I'm in front of my computer again!
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Fixed in a7ce2cf