Skip to content

Commit

Permalink
Patch Dockerfile errors
Browse files Browse the repository at this point in the history
  • Loading branch information
Juan Crespín committed May 13, 2022
1 parent 05dc1cb commit e1e7a75
Show file tree
Hide file tree
Showing 5 changed files with 23 additions and 20 deletions.
12 changes: 6 additions & 6 deletions app/services/kafka/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,11 @@
FROM bitnami/kafka:2.8-debian-10

# Copy all the utilities scripts
COPY ./kafka/scripts/linux/boot.sh /scripts/linux/boot.sh
COPY ./kafka/scripts/linux/consumers.sh /scripts/linux/consumers.sh
COPY ./kafka/scripts/linux/producers.sh /scripts/linux/producers.sh
COPY ./kafka/scripts/linux/topics.sh /scripts/linux/topics.sh
COPY ./kafka/scripts/data/topics.txt /scripts/data/topics.txt
COPY ./scripts/linux/boot.sh /scripts/linux/boot.sh
COPY ./scripts/linux/consumers.sh /scripts/linux/consumers.sh
COPY ./scripts/linux/producers.sh /scripts/linux/producers.sh
COPY ./scripts/linux/topics.sh /scripts/linux/topics.sh
COPY ./scripts/linux/data/topics.txt /scripts/data/topics.txt

# Execute all the commands needed when booted up
RUN boot.sh
#RUN boot.sh
19 changes: 9 additions & 10 deletions app/services/node-red/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,18 @@
FROM nodered/node-red:2.2.2-12

# Copy the requirements file
COPY ./node-red/data/package.json /data/package.json
COPY ./data/package.json /data/package.json
RUN cd /data && npm install

# Copy Node-RED configuration files
COPY ./node-red/data/settings.js /data/settings.js
COPY ./node-red/data/flows_cred.json /data/flows_cred.json
COPY ./node-red/data/flows.json /data/flows.json
COPY ./data/settings.js /data/settings.js
COPY ./data/flows_cred.json /data/flows_cred.json
COPY ./data/flows.json /data/flows.json

# Copy all the utilities scripts
COPY ./node-red/scripts/linux/boot.sh /scripts/linux/boot.sh
COPY ./node-red/scripts/linux/install.sh /scripts/linux/install.sh
COPY ./node-red/scripts/linux/root.sh /scripts/linux/root.sh
COPY ./node-red/scripts/linux/start.sh /scripts/linux/start.sh
COPY ./scripts/linux/boot.sh /usr/src/node-red/boot.sh
COPY ./scripts/linux/install.sh /usr/src/node-red/install.sh
COPY ./scripts/linux/root.sh /usr/src/node-red/root.sh
COPY ./scripts/linux/start.sh /usr/src/node-red/start.sh

WORKDIR /usr/src/node-red
RUN /scripts/linux/boot.sh
WORKDIR /usr/src/node-red
5 changes: 4 additions & 1 deletion app/services/node-red/data/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,9 @@
{
"dependencies": {
"node-red-contrib-kafka-client": "0.0.10"
"node-red-contrib-kafka-client": "0.0.10",
"node-red-dashboard":"3.0.4",
"node-red-node-twitter":"1.2.0"

},
"scripts": {
"start": "node-red"
Expand Down
2 changes: 1 addition & 1 deletion app/services/node-red/scripts/windows/boot.bat
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
REM Boots Node-RED
call install.bat
call start.bat
REM call start.bat
5 changes: 3 additions & 2 deletions tools/windows/infra/start.bat
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
REM Moves to the infraestructure folder
call infraestructure.bat
call infrastructure.bat

REM Boots all the containers on detach mode
docker-compose up -d
docker-compose up -d
pause

0 comments on commit e1e7a75

Please sign in to comment.