Skip to content

Commit

Permalink
Simplify Docker image specification by removing no longer used depend…
Browse files Browse the repository at this point in the history
…encies

* Update Docker image base to more recent Alpine version

* Update test build script to reflect latest changes

- Remove remaining references to Lua, Lua rocks and Lua libraries

- Remove check lua binaries and libraries verification scripts
  • Loading branch information
filippsen committed Mar 22, 2021
1 parent bc77146 commit 6368d49
Show file tree
Hide file tree
Showing 4 changed files with 2 additions and 163 deletions.
26 changes: 2 additions & 24 deletions build/Dockerfile
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
#
FROM alpine:3.6
FROM alpine:3.13
MAINTAINER https://github.com/space-sh/space/

# Version
Expand All @@ -10,31 +10,9 @@ ENV VERSION $VERSION
# Space files
COPY Spacefile.sh Spacefile.yaml space ./

# Lua rocks and lua libs build dependencies
RUN apk add --no-cache --virtual .build-deps autoconf gcc libc-dev lua5.1-dev make openssl unzip \

# Base install
&& apk add --no-cache bash curl git lua5.1 luajit yaml-dev \

# Lua rocks
&& curl -LO https://luarocks.org/releases/luarocks-2.4.1.tar.gz \
&& tar zxpf luarocks-2.4.1.tar.gz \
&& cd luarocks-2.4.1 \
&& ./configure \
&& make bootstrap \
&& cd .. \
&& rm -rf ./luarocks-2.4.1 luarocks-2.4.1.tar.gz \

# Lua libs
&& luarocks install lbase64 \
&& luarocks install lua-cjson \
&& luarocks install luaposix \
&& luarocks install lyaml \

# Cleanup
&& apk del .build-deps \
RUN apk add --no-cache bash curl git \

# Space
&& ./space /install/ \
&& rm Spacefile.sh Spacefile.yaml space

84 changes: 0 additions & 84 deletions test/build/check_lua_binaries.sh

This file was deleted.

38 changes: 0 additions & 38 deletions test/build/check_lua_libraries.sh

This file was deleted.

17 changes: 0 additions & 17 deletions test/test_build.sh
Original file line number Diff line number Diff line change
Expand Up @@ -53,20 +53,3 @@ else
printf "\033[31m[ERROR] Base libraries\033[0m\n"
exit 1
fi

cat ./test/build/check_lua_binaries.sh | docker run --rm -i $CI_REGISTRY_IMAGE:$IMAGE_VERSION /bin/bash
if [ "$?" -eq 0 ]; then
printf "\033[32m[OK] Lua binaries\033[0m\n"
else
printf "\033[31m[ERROR] Lua binaries\033[0m\n"
exit 1
fi

cat ./test/build/check_lua_libraries.sh | docker run --rm -i $CI_REGISTRY_IMAGE:$IMAGE_VERSION /bin/bash
if [ "$?" -eq 0 ]; then
printf "\033[32m[OK] Lua libraries\033[0m\n"
else
printf "\033[31m[ERROR] Lua libraries\033[0m\n"
exit 1
fi

0 comments on commit 6368d49

Please sign in to comment.