Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
gendl
gendl
Commits
365c99f3
Commit
365c99f3
authored
May 10, 2021
by
Dave Cooper
Browse files
fixed docker build and allegro startup
parent
e7674604
Pipeline
#3673
failed with stages
in 8 minutes and 39 seconds
Changes
5
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
docker/Dockerfile
View file @
365c99f3
...
...
@@ -2,8 +2,8 @@ FROM ubuntu:latest
ARG
DEBIAN_FRONTEND=noninteractive
ARG
swank_port=4200
ARG
gwl_port=9000
ENV
swank_port=4200
ENV
gwl_port=9000
EXPOSE
$swank_port
...
...
@@ -11,6 +11,7 @@ EXPOSE $gwl_port
RUN
apt-get
-y
update
&&
apt-get
-y
upgrade
RUN
apt-get
-y
install
openssl libssl-dev iputils-ping telnet git git-flow ghostscript
&&
\
rm
-rf
/var/cache/apk/
*
&&
apt-get clean
&&
groupadd
-g
1000 gendl-user
&&
\
useradd
-rm
-s
/bin/bash
-u
1000
-g
root
-G
sudo
gendl-user
&&
ln
-s
/home /Users
...
...
docker/build
View file @
365c99f3
...
...
@@ -10,36 +10,39 @@
#
cd
..
cd
`dirname $0`
/
..
/
..
/
echo
"Present Working Directory: "
`pwd`
CI_PIPELINE_ID
=
$
{
CI_PIPELINE_ID
:
=
"3504"
}
#
# FLAG -- use below when we want to use fixed build
# and update .gitlab-ci.yml to match.
#
#CI_PIPELINE_ID="3521"
CI_PIPELINE_ID
=
$
{
CI_PIPELINE_ID
:
=
"3662"
}
dist_name
=
gendl
-
build
$
{
CI_PIPELINE_ID
}
L
-
linux64
DIST_NAME
=
gendl
-
build
$
{
CI_PIPELINE_ID
}
L
-
linux64
dist_zip_server
=/
home
/
builder
/
genworks
/
manager
/
staging
/
gendl
/
$
{
CI_PIPELINE_ID
}
L
/
distribution
/
$
{
dist_name
}.
zip
dist_zip_local
=~/
genworks
/
builds
/
$
{
dist_name
}.
zip
DIST_ZIP
=/
home
/
builder
/
genworks
/
manager
/
staging
/
gendl
/
$
{
CI_PIPELINE_ID
}
L
/
distribution
/
$
{
DIST_NAME
}.
zip
if
[
-
f
"$dist_zip_server"
];
then
dist_zip
=
$
dist_zip_server
elif
[
-
f
"$dist_zip_local"
];
then
dist_zip
=
$
dist_zip_local
else
echo
"Neither $dist_zip_server nor $dist_zip_local was found. Exiting."
exit
1
cp
$
DIST_ZIP
.
i
unzip
-
q
$
{
DIST_NAME
}.
zip
rm
$
{
DIST_NAME
}.
zip
cp
$
dist_
zip
.
mv
$
{
DIST_NAME
}
gendl
-
build
/
unzip
-
q
$
{
dist_name
}.
zip
docker
build
-
t
dcooper8
/
gendl
:
latest
-
f
gendl
/
docker
/
Dockerfile
.
rm
$
{
dist_name
}.
zip
rm
-
rf
gendl
-
build
/
docker
push
dcooper8
/
gendl
:
latest
mv
$
{
dist_name
}
gendl
-
build
/
docker
build
-
t
dcooper8
/
gendl
:
latest
-
f
.
/
gendl
/
docker
/
Dockerfile
.
rm
-
rf
gendl
-
build
/
docker
push
dcooper8
/
gendl
:
latest
docker/run
View file @
365c99f3
...
...
@@ -25,7 +25,7 @@
# CID=$(docker run -d -it --rm dcooper8/gendl:latest) # starts but hangs (bad). No port 4200.
CID
=
$(
docker run
-d
-
it
--rm
-p
9000:9000
-p
4200:4200 dcooper8/gendl:latest
)
# works.
CID
=
$(
docker run
-
i
d
-
-rm
-h
gendl
--name
gendl
-p
9000:9000
-p
4200:4200 dcooper8/gendl:latest
)
# works.
...
...
docker/stop
View file @
365c99f3
#!/bin/bash
docker stop gendl
-t0
docker stop
dcooper8/
gendl
-t0
gwl/zzinit/source/initialize.lisp
View file @
365c99f3
...
...
@@ -99,11 +99,12 @@ Perhaps a zombie process is holding port ~a?~%" port port))
#-
(
or
ccl
sbcl
)
(
multiple-value-bind
(
result
error
)
(
ignore-errors
(
glisp:with-timeout
(
2
(
error
"AllegroServe port probe timed out on port ~a.
(
glisp:with-timeout
(
3
(
error
"AllegroServe port probe timed out on port ~a.
Perhaps a zombie process is holding port ~a?~%"
port
port
))
(
net.aserve.client:do-http-request
(
format
nil
"http://127.0.0.1:~a"
port
))))
(
net.aserve.client:do-http-request
(
format
nil
"http://127.0.0.1:~a"
port
))))
(
declare
(
ignore
result
))
(
when
(
typep
error
#-
allegro
'error
#+
allegro
'excl:socket-error
)
port
))
(
when
(
or
(
typep
error
#-
allegro
'error
#+
allegro
'excl:socket-error
)
(
typep
error
#-
allegro
'error
#+
allegro
'simple-error
))
port
))
#+
(
or
ccl
sbcl
)
(
let*
((
result
(
handler-case
...
...
@@ -117,6 +118,9 @@ Perhaps a zombie process is holding port ~a?~%" port port))
(
net.aserve.client:do-http-request
(
format
nil
"http://127.0.0.1:~a"
port
))))
port
)))
(
defun
start-gwl
(
&key
(
port
*aserve-port*
)
(
listeners
*aserve-listeners*
)
;;
;; FLAG -- figure out external-format for the other Lisps.
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment