Ver código fonte

Fixed docker images for Lisp frameworks Woo, Ningle and NingleX. (#8220)

* Fixed docker images for Lisp frameworks Woo, Ningle and NingleX.

* Removed "broken" tags from woo, ningle and ninglex.
Alexander Artemenko 2 anos atrás
pai
commit
aed83be1d5

+ 1 - 2
frameworks/Lisp/ningle/benchmark_config.json

@@ -23,8 +23,7 @@
                 "database_os": "Linux",
                 "display_name": "Ningle",
                 "notes": "",
-                "versus": "",
-                "tags": ["broken"]
+                "versus": ""
             }
         }
     ]

+ 16 - 7
frameworks/Lisp/ningle/ningle.dockerfile

@@ -1,7 +1,11 @@
-FROM debian:stretch-slim AS debian
+FROM debian:bullseye-slim AS debian
 
-ARG DEBIAN_FRONTEND=noninteractive
-ARG TERM=linux
+ENV DEBIAN_FRONTEND noninteractive
+ENV TERM linux
+ENV ROS_VERSION 22.12.14.113
+ENV LISP sbcl-bin/2.3.4
+ENV ASDF_VERSION 3.3.6
+ENV QUICKLISP_VERSION 2023-02-15
 
 RUN echo 'APT::Get::Install-Recommends "false";' > /etc/apt/apt.conf.d/00-general \
     && echo 'APT::Get::Install-Suggests "false";' >> /etc/apt/apt.conf.d/00-general \
@@ -17,10 +21,14 @@ RUN apt-get update -q \
          ca-certificates curl libcurl3-gnutls \
          make \
     && rm -rf /var/lib/apt/lists/* \
-    && curl -L -O https://github.com/roswell/roswell/releases/download/v19.06.10.100/roswell_19.06.10.100-1_amd64.deb \
-    && dpkg -i roswell_19.06.10.100-1_amd64.deb \
-    && ros setup \
-    && rm roswell_19.06.10.100-1_amd64.deb
+    && curl -L -O https://github.com/roswell/roswell/releases/download/v${ROS_VERSION}/roswell_${ROS_VERSION}-1_amd64.deb \
+    && dpkg -i roswell_${ROS_VERSION}-1_amd64.deb \
+    && ros quicklisp.dist=http://beta.quicklisp.org/dist/quicklisp/${QUICKLISP_VERSION}/distinfo.txt setup \
+    && ros install ${LISP} \ 
+    && ros use ${LISP} \ 
+    && ros install asdf/${ASDF_VERSION} \
+    && ros config \
+    && rm roswell_${ROS_VERSION}-1_amd64.deb
 
 RUN echo 'export PATH=$HOME/.roswell/bin:$PATH' >> ~/.bashrc
 
@@ -52,5 +60,6 @@ COPY --from=builder /ningle/ningle .
 RUN ["chmod", "+x", "./ningle"]
 
 EXPOSE 8080
+EXPOSE 4005
 
 CMD ./ningle --worker $(nproc) --address 0.0.0.0 --port 8080

+ 1 - 2
frameworks/Lisp/ninglex/benchmark_config.json

@@ -23,8 +23,7 @@
                 "database_os": "Linux",
                 "display_name": "Ninglex",
                 "notes": "",
-                "versus": "",
-                "tags": ["broken"]
+                "versus": ""
             }
         }
     ]

+ 15 - 7
frameworks/Lisp/ninglex/ninglex.dockerfile

@@ -1,7 +1,11 @@
-FROM debian:stretch-slim AS debian
+FROM debian:bullseye-slim AS debian
 
-ARG DEBIAN_FRONTEND=noninteractive
-ARG TERM=linux
+ENV DEBIAN_FRONTEND noninteractive
+ENV TERM linux
+ENV ROS_VERSION 22.12.14.113
+ENV LISP sbcl-bin/2.3.4
+ENV ASDF_VERSION 3.3.6
+ENV QUICKLISP_VERSION 2023-02-15
 
 RUN echo 'APT::Get::Install-Recommends "false";' > /etc/apt/apt.conf.d/00-general \
     && echo 'APT::Get::Install-Suggests "false";' >> /etc/apt/apt.conf.d/00-general \
@@ -17,10 +21,14 @@ RUN apt-get update -q \
          ca-certificates curl libcurl3-gnutls \
          make \
     && rm -rf /var/lib/apt/lists/* \
-    && curl -L -O https://github.com/roswell/roswell/releases/download/v19.06.10.100/roswell_19.06.10.100-1_amd64.deb \
-    && dpkg -i roswell_19.06.10.100-1_amd64.deb \
-    && ros setup \
-    && rm roswell_19.06.10.100-1_amd64.deb
+    && curl -L -O https://github.com/roswell/roswell/releases/download/v${ROS_VERSION}/roswell_${ROS_VERSION}-1_amd64.deb \
+    && dpkg -i roswell_${ROS_VERSION}-1_amd64.deb \
+    && ros quicklisp.dist=http://beta.quicklisp.org/dist/quicklisp/${QUICKLISP_VERSION}/distinfo.txt setup \
+    && ros install ${LISP} \ 
+    && ros use ${LISP} \ 
+    && ros install asdf/${ASDF_VERSION} \
+    && ros config \
+    && rm roswell_${ROS_VERSION}-1_amd64.deb
 
 RUN echo 'export PATH=$HOME/.roswell/bin:$PATH' >> ~/.bashrc
 

+ 1 - 2
frameworks/Lisp/woo/benchmark_config.json

@@ -23,8 +23,7 @@
                 "database_os": "Linux",
                 "display_name": "Woo",
                 "notes": "",
-                "versus": "",
-                "tags": ["broken"]
+                "versus": ""
             }
         }
     ]

+ 15 - 7
frameworks/Lisp/woo/woo.dockerfile

@@ -1,7 +1,11 @@
-FROM debian:stretch-slim AS debian
+FROM debian:bullseye-slim AS debian
 
-ARG DEBIAN_FRONTEND=noninteractive
-ARG TERM=linux
+ENV DEBIAN_FRONTEND noninteractive
+ENV TERM linux
+ENV ROS_VERSION 22.12.14.113
+ENV LISP sbcl-bin/2.3.4
+ENV ASDF_VERSION 3.3.6
+ENV QUICKLISP_VERSION 2023-02-15
 
 RUN echo 'APT::Get::Install-Recommends "false";' > /etc/apt/apt.conf.d/00-general \
     && echo 'APT::Get::Install-Suggests "false";' >> /etc/apt/apt.conf.d/00-general \
@@ -17,10 +21,14 @@ RUN apt-get update -q \
          ca-certificates curl libcurl3-gnutls \
          make \
     && rm -rf /var/lib/apt/lists/* \
-    && curl -L -O https://github.com/roswell/roswell/releases/download/v19.06.10.100/roswell_19.06.10.100-1_amd64.deb \
-    && dpkg -i roswell_19.06.10.100-1_amd64.deb \
-    && ros setup \
-    && rm roswell_19.06.10.100-1_amd64.deb
+    && curl -L -O https://github.com/roswell/roswell/releases/download/v${ROS_VERSION}/roswell_${ROS_VERSION}-1_amd64.deb \
+    && dpkg -i roswell_${ROS_VERSION}-1_amd64.deb \
+    && ros quicklisp.dist=http://beta.quicklisp.org/dist/quicklisp/${QUICKLISP_VERSION}/distinfo.txt setup \
+    && ros install ${LISP} \ 
+    && ros use ${LISP} \ 
+    && ros install asdf/${ASDF_VERSION} \
+    && ros config \
+    && rm roswell_${ROS_VERSION}-1_amd64.deb
 
 RUN echo 'export PATH=$HOME/.roswell/bin:$PATH' >> ~/.bashrc