zoneminder-containers / zoneminder-base

An always up-to-date automatically building ZoneMinder container
101 stars 32 forks source link

nightly environments are not up to date with master #51

Closed Simpler1 closed 1 year ago

Simpler1 commented 1 year ago

The latest changes to https://github.com/ZoneMinder/zoneminder are not available in the nightly environments

image

It seems to be at least a month behind.

Could this be related to the change from version to version.txt https://github.com/ZoneMinder/zoneminder/commit/b20159d980fdb2b90c91541061c5ab011b73afa4

alexyao2015 commented 1 year ago

Not sure what you're talking about. That screenshot shows a build from the most recent zoneminder commit. Looks like it's working fine to me.

Simpler1 commented 1 year ago

No commits since about June 14th are in the nightly-1234 environment.

Look at line 286 of /var/www/html/skins/classic/views/js/event.js In the zoneminder master, it is: setCookie('zmEventScale'+eventData.MonitorId, scale);

but in the nightly-1234 environment, it is: setCookie('zmEventScale'+eventData.MonitorId, scale, 3600);

That's just one example.

Simpler1 commented 1 year ago

Zoneminder moved to 1.37.41 on July 12th, but the nighly is still showing 1.37.40.

alexyao2015 commented 1 year ago

That's probably something wrong with zoneminder then. You should consider reporting this to zoneminder if you believe their builds are broken. It's impossible for it to be building the wrong version since it just pulls from git directly. Nothing special is going on.

https://github.com/zoneminder-containers/zoneminder-base/blob/2919b82cacf9a5407defaff9a55d9f54ee5aa654/Dockerfile#L18

Simpler1 commented 1 year ago

If I run: git clone https://github.com/ZoneMinder/zoneminder.git . and then check the file above, line 286 has the correct change. also git log, shows all of the commits.

These commits are not in the nightly-1234 environment. Do you see them in the nightly-1234 environment?

alexyao2015 commented 1 year ago

I can go ahead and test this. I don't run zoneminder and as a result, this package, so I haven't noticed anything.

alexyao2015 commented 1 year ago

Looks as expected to me. I would suggest clearing your docker image cache.

@alexyao2015 ➜ /workspaces/zoneminder-base (main) $ docker exec -it zoneminder-base-zoneminder-1 /bin/bash
root@66fd189eb89a:~# cd /var/www/html/skins/classic/views/js
root@66fd189eb89a:/var/www/html/skins/classic/views/js# sed -n 284,290p event.js
    alarmCue.html(renderAlarmCues(eventViewer));
  }
  setCookie('zmEventScale'+eventData.MonitorId, scale);

  // After a resize, check if we still have room to display the event stats table
  onStatsResize(newWidth);
} // end function changeScale
Simpler1 commented 1 year ago

I've been debugging this myself and was just about to close this issue when you did.

In order to add vim to the zoneminder container, in the docker-compose.yaml file I changed image: ghcr.io/zoneminder-containers/zoneminder-base:nightly-1234 to build: .

and then added the following Dockerfile to the directory:

FROM ghcr.io/zoneminder-containers/zoneminder-base:nightly-1234
RUN apt-get update && apt-get install -y vim

For some reason, that does not honor the nightly-1234 tag and does not update.

Thank you for looking into this. I'll try to figure out why the build command does not update properly.