1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
|
From 7c838e094320073b596d365496071d00992d37fa Mon Sep 17 00:00:00 2001
From: Colin Dellow <cldellow@gmail.com>
Date: Fri, 18 Oct 2024 03:52:02 -0400
Subject: docker: luarocks, luaflock, lua-sql-sqlite3 (#766)
---
Dockerfile | 6 +++++-
src/osm_lua_processing.cpp | 3 ++-
2 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/Dockerfile b/Dockerfile
index ff4da63..c27ca2a 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,9 +9,11 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
libboost-program-options-dev \
libboost-filesystem-dev \
libboost-system-dev \
+ luarocks \
rapidjson-dev \
cmake && \
- rm -rf /var/lib/apt/lists/*
+ rm -rf /var/lib/apt/lists/* && \
+ luarocks install luaflock
WORKDIR /usr/src/app
@@ -35,6 +37,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
liblua5.1-0 \
shapelib \
libsqlite3-0 \
+ lua-sql-sqlite3 \
libboost-filesystem1.74.0 \
libboost-program-options1.74.0 && \
rm -rf /var/lib/apt/lists/*
@@ -42,6 +45,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y --no-ins
WORKDIR /usr/src/app
COPY --from=src /usr/src/app/build/tilemaker .
COPY --from=src /usr/src/app/build/tilemaker-server .
+COPY --from=src /usr/local/lib/lua/5.1/flock.so /usr/local/lib/lua/5.1/flock.so
COPY resources ./resources
COPY process.lua ./
COPY config.json ./
diff --git a/src/osm_lua_processing.cpp b/src/osm_lua_processing.cpp
index 12b0323..62cdf10 100644
--- a/src/osm_lua_processing.cpp
+++ b/src/osm_lua_processing.cpp
@@ -199,7 +199,8 @@ bool supportsRemappingShapefiles = false;
int lua_error_handler(int errCode, const char *errMessage)
{
- std::cerr << "lua runtime error: " << std::endl;
+ std::cerr << "lua runtime error " << std::to_string(errCode) << ":" << std::endl;
+ std::cerr << errMessage << std::endl;
kaguya::util::traceBack(g_luaState->state(), errMessage); // full traceback on 5.2+
kaguya::util::stackDump(g_luaState->state());
throw OsmLuaProcessing::luaProcessingException();
--
2.47.3
|
